merge fix
Merge remote-tracking branch 'origin/master'

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