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

Trivial merge