Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 14 Apr 2016 11:00:38 +0000 (12:00 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 14 Apr 2016 11:00:38 +0000 (12:00 +0100)

Trivial merge