Conflicts:
	app/views/layouts/application.html.haml
	app/views/status_messages/_status_message.html.haml