Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 5 Aug 2015 17:11:27 +0000 (18:11 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 5 Aug 2015 17:11:27 +0000 (18:11 +0100)

Trivial merge