add new style
add new style
Merge origin/master

Conflicts:
	app/views/layouts/sidebar.php