colours to the answers
Merge remote-tracking branch 'origin/master' into activity-admin