Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Tue, 26 Apr 2016 16:49:08 +0000 (17:49 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 26 Apr 2016 16:49:08 +0000 (17:49 +0100)

Trivial merge