adjust merge conflicts
Merge branch 'master' into frontend

Conflicts:
	app/assets/stylesheets/application.css
merge conflicts