Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 14 Jun 2016 11:31:34 +0000 (12:31 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 14 Jun 2016 11:31:34 +0000 (12:31 +0100)

Trivial merge