i18n on error messages
lineendings
Merge branch 'proper-hotfix'

* proper-hotfix:
  i18n on error messages

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less