Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	app/templates/src/main/webapp/i18n/_de.json
Apidocs label renamed to 'API'