Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 14:22:07 +0000 (15:22 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 14:22:07 +0000 (15:22 +0100)

Trivial merge