Fix three column layout merge with the colours picker.
Fix the merge for the feature: alternatives colors defined by administrators.
Hide categories icon 'collapsed' in course/index.php page
Merge pull request #106 from leblangi/hidecollapse-master

Hide categories icon 'collapsed' in course/index.php page
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
Merge remote-tracking branch 'upstream/master'