Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 26 Apr 2016 07:59:54 +0000 (08:59 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 26 Apr 2016 07:59:54 +0000 (08:59 +0100)

Trivial merge