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

Trivial merge