Merge branch 'develop' into features/JAL-1912_biojson-per-sequence-annotation
authorJim Procter <jprocter@issues.jalview.org>
Mon, 5 Oct 2015 12:43:27 +0000 (13:43 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 5 Oct 2015 12:43:27 +0000 (13:43 +0100)

Trivial merge