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

Trivial merge