Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 29 May 2015 15:41:21 +0000 (16:41 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 29 May 2015 15:41:21 +0000 (16:41 +0100)

Trivial merge