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

Trivial merge