Demo
Merge branch 'master' into PR_FridayDemo
Fixed sidebar class