Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 13 Sep 2016 09:51:36 +0000 (10:51 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 13 Sep 2016 09:51:36 +0000 (10:51 +0100)

Trivial merge