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

Trivial merge