Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 18 Aug 2015 10:47:46 +0000 (11:47 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 18 Aug 2015 10:47:46 +0000 (11:47 +0100)

Trivial merge