Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 23 Nov 2016 15:22:50 +0000 (15:22 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 23 Nov 2016 15:22:50 +0000 (15:22 +0000)

Trivial merge