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

Trivial merge