Merge branch 'features/JAL-1933_occupancy' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 2 Dec 2016 15:18:04 +0000 (15:18 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 2 Dec 2016 15:18:04 +0000 (15:18 +0000)

Trivial merge