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

Trivial merge