sidebar changed to red
Merge branch 'master' into admin