Merge branch 'bug/JAL-2386groupConservationColouring' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 15 Jun 2017 13:08:32 +0000 (14:08 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 15 Jun 2017 13:08:32 +0000 (14:08 +0100)

Trivial merge