Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Thu, 26 May 2016 15:42:58 +0000 (16:42 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 26 May 2016 15:42:58 +0000 (16:42 +0100)

Trivial merge