Merge branch 'develop' into spike/JAL-2040_JAL-2137_phyre2
authorJim Procter <jprocter@issues.jalview.org>
Mon, 4 Jul 2016 10:38:02 +0000 (11:38 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 4 Jul 2016 10:38:02 +0000 (11:38 +0100)

Trivial merge