Merge branch 'ismb/2015_demo' into develop
authorJim Procter <jprocter@issues.jalview.org>
Tue, 21 Jul 2015 13:53:27 +0000 (14:53 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 21 Jul 2015 13:53:27 +0000 (14:53 +0100)

Trivial merge