Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Tue, 22 Sep 2015 14:25:13 +0000 (15:25 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 22 Sep 2015 14:25:13 +0000 (15:25 +0100)

Trivial merge