Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 3 Sep 2015 09:21:01 +0000 (10:21 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 3 Sep 2015 09:21:01 +0000 (10:21 +0100)

Trivial merge