Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 22 Jun 2016 11:54:43 +0000 (12:54 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 22 Jun 2016 11:54:43 +0000 (12:54 +0100)

Trivial merge