started fixing and coding tests and shit
Merge branch 'master' of https://github.com/meca1012/Klinikum.git

Conflicts:
	src/main/java/de/klinikum/service/PatientService.java
	src/main/java/de/klinikum/service/PatientServiceImpl.java
	src/test/java/connection/MainTest.java
	src/test/java/service/PatientServiceTest.java
Merge branch 'master' of https://github.com/meca1012/Klinikum.git

Conflicts:
	src/main/java/de/klinikum/communication/ConceptRest.java