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

Conflicts:
	src/main/java/de/klinikum/domain/util/SimpleGraph.java