side menu configured
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/bootstrap/css/new_base.css
	tutorial/templates/category_detail.html
	tutorial/templates/tutorial_page.html
side menu configured