Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 13 Jul 2016 10:28:11 +0000 (11:28 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 13 Jul 2016 10:28:11 +0000 (11:28 +0100)

Trivial merge