Fix three column layout merge with the colours picker.
Fix the merge for the feature: alternatives colors defined by administrators.
Merge pull request #103 from leblangi/master

Fix three column layout merge with the colours picker.

Would be good to get this all into AMOS. Ill follow up with David M to see why they are not coming through