Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 21 Nov 2016 13:03:50 +0000 (13:03 +0000)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 21 Nov 2016 13:03:50 +0000 (13:03 +0000)

Trivial merge