Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 15 Jun 2015 11:19:54 +0000 (12:19 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 15 Jun 2015 11:19:54 +0000 (12:19 +0100)

Trivial merge