Merge branch 'develop' of https://source.jalview.org/git/jalview into features/JAL...
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 3 Apr 2017 15:31:38 +0000 (16:31 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 3 Apr 2017 15:31:38 +0000 (16:31 +0100)

Trivial merge