Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Tue, 12 Jul 2016 10:35:18 +0000 (11:35 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 12 Jul 2016 10:35:18 +0000 (11:35 +0100)

Trivial merge