locales
Merge commit '71126a03ae9afeba30d579041726527a1f5cc85e'

Conflicts:
	assets/locales/de.json