Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 25 Apr 2017 11:45:44 +0000 (12:45 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 25 Apr 2017 11:45:44 +0000 (12:45 +0100)

Trivial merge