Refactor service layer
Merge remote-tracking branch 'origin/develop' into develop
Refactoring
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/resources/messages_de.properties
	src/main/resources/messages_en.properties
Refactoring