Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 24 Aug 2015 08:25:22 +0000 (09:25 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 24 Aug 2015 08:25:22 +0000 (09:25 +0100)

Trivial merge