Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 20 May 2015 09:35:03 +0000 (10:35 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 20 May 2015 09:35:03 +0000 (10:35 +0100)

Trivial merge