Merge branch 'features/JAL-1933_occupancy' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 5 Dec 2016 09:05:26 +0000 (09:05 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 5 Dec 2016 09:05:26 +0000 (09:05 +0000)

Trivial merge