Merge branch 'develop' of https://source.jalview.org/git/jabaws into develop
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 4 Oct 2013 14:20:57 +0000 (15:20 +0100)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 4 Oct 2013 14:20:57 +0000 (15:20 +0100)

Trivial merge