Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 4 Jun 2015 10:51:47 +0000 (11:51 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 4 Jun 2015 10:51:47 +0000 (11:51 +0100)

Trivial merge