Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 16 Nov 2016 14:38:42 +0000 (14:38 +0000)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 16 Nov 2016 14:38:42 +0000 (14:38 +0000)

Trivial merge