Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 18 Jul 2016 15:36:58 +0000 (16:36 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 18 Jul 2016 15:36:58 +0000 (16:36 +0100)

Trivial merge