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

Trivial merge