Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 10 Nov 2016 15:55:51 +0000 (15:55 +0000)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 10 Nov 2016 15:55:51 +0000 (15:55 +0000)

Trivial merge