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

Trivial merge