Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 2 Jun 2016 16:36:57 +0000 (17:36 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 2 Jun 2016 16:36:57 +0000 (17:36 +0100)
merge


Trivial merge