Sidebar addition
Merge branch 'sidebar_project'

Conflicts:
	public/app/resources/less/theme/accordion.less
	public/app/resources/less/theme/forms.less
	public/app/resources/less/theme/main.less