Merge branch 'develop' of https://source.jalview.org/git/jabaws into develop
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Mon, 28 Apr 2014 20:20:00 +0000 (21:20 +0100)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Mon, 28 Apr 2014 20:20:00 +0000 (21:20 +0100)

Trivial merge