fix
Merge remote-tracking branch 'origin/bug_fix' into dev

Conflicts:
	app/assets/stylesheets/application.css