Fix errors
Improvements
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/resources/messages_de.properties