Merge branch 'develop' into features/JAL-1933_occupancy
authorJim Procter <jprocter@issues.jalview.org>
Thu, 27 Apr 2017 10:11:48 +0000 (11:11 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 27 Apr 2017 10:11:48 +0000 (11:11 +0100)

Trivial merge