updated resources
Merge branch 'master' into beta

Conflicts:
	assets/resources/application/de.xml