Merge branch 'merge/develop_JAL-1780_JAL-653_JAL-1892' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 24 Jun 2015 14:11:45 +0000 (15:11 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 24 Jun 2015 14:11:45 +0000 (15:11 +0100)

Trivial merge