Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 14 Jun 2016 16:48:04 +0000 (17:48 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 14 Jun 2016 16:48:04 +0000 (17:48 +0100)

Trivial merge