Merge branch 'extended-i18n' into foodcoop-adam-new

Conflicts:
	app/controllers/sessions_controller.rb