Merge branch 'features/JAL-2295setChimeraAttributes' into features/JAL-2351jmolExchange features/JAL-2351jmolExchange
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 8 Dec 2016 11:13:02 +0000 (11:13 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 8 Dec 2016 11:13:02 +0000 (11:13 +0000)

Trivial merge