merge test
Merge branch 'teil1' of git@github.com:Crudelus/MIO-FHIR-Project.git
into teil1

Conflicts:
	src/main/java/de/uniluebeck/imi/mio/fhirProject/devices/IDevice.java