Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 14 Jul 2016 14:07:22 +0000 (15:07 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 14 Jul 2016 14:07:22 +0000 (15:07 +0100)

Trivial merge