Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Thu, 23 Jul 2015 16:19:57 +0000 (17:19 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 23 Jul 2015 16:19:57 +0000 (17:19 +0100)

Trivial merge