fix hr
fix german
fix german
Merge branch 'origin/master'

Conflicts:
	src/i18n/de-AT.js