Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authorCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 23 Jan 2015 10:37:58 +0000 (10:37 +0000)
committerCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 23 Jan 2015 10:37:58 +0000 (10:37 +0000)

Trivial merge