Move flash locales to his own file
Move stale flash messages to flash.yml
Merge ../x0y0

Conflicts:
	app/controllers/sessions_controller.rb
	config/locales/views.es.yml