Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Thu, 8 Oct 2015 11:11:51 +0000 (12:11 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 8 Oct 2015 11:11:51 +0000 (12:11 +0100)

Trivial merge