localeapp roundtrip
Merge branch 'master' into feature-receive

Conflicts:
	config/locales/de.yml