...
Merge branch 'master' of https://github.com/meca1012/Klinikum.git

Conflicts:
	src/test/java/service/ConceptServiceTest.java
Merge branch 'master' of https://github.com/meca1012/Klinikum.git