Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 1 Jul 2015 14:23:19 +0000 (15:23 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 1 Jul 2015 14:23:19 +0000 (15:23 +0100)

Trivial merge