Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 16 Sep 2015 14:04:42 +0000 (15:04 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 16 Sep 2015 14:04:42 +0000 (15:04 +0100)

Trivial merge