Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 13 Nov 2014 16:15:54 +0000 (16:15 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 13 Nov 2014 16:15:54 +0000 (16:15 +0000)

Trivial merge