Fix admin style
Merge branch 'feature/fix_style' into develop

Conflicts:
	app/assets/stylesheets/admin.css.scss