Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 30 May 2016 13:47:17 +0000 (14:47 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 30 May 2016 13:47:17 +0000 (14:47 +0100)

Trivial merge