Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 21 Mar 2016 16:46:41 +0000 (16:46 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 21 Mar 2016 16:46:41 +0000 (16:46 +0000)

Trivial merge