Merge branch 'bug/JAL-2517cancelAppletColour' into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 29 May 2017 10:52:46 +0000 (11:52 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 29 May 2017 10:52:46 +0000 (11:52 +0100)

Trivial merge