sidebar
Merge branch 'master' of https://github.com/wonknu/playground

Conflicts:
	design/frontend/default/base/assets/css/playground.css