Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 8 Nov 2016 10:22:05 +0000 (10:22 +0000)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 8 Nov 2016 10:22:05 +0000 (10:22 +0000)

Trivial merge