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

Trivial merge