Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 29 Jun 2016 13:58:41 +0000 (14:58 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 29 Jun 2016 13:58:41 +0000 (14:58 +0100)

Trivial merge