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

Trivial merge