sidebar
Merge branch 'sidebar'

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