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

Trivial merge