Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 2 Sep 2015 12:40:32 +0000 (13:40 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 2 Sep 2015 12:40:32 +0000 (13:40 +0100)

Trivial merge