controllerundconverteraktualsiert
Merge remote-tracking branch 'origin/master'

Conflicts:
	foobar/src/main/java/jrmds/xml/XmlController.java
	foobar/src/main/java/jrmds/xml/XmlConverter.java
Merge remote-tracking branch 'origin/master' into featureGroup
Merge branch 'master' of https://github.com/swt14w01/JRMDS
Merge branch 'master' into featureGroup
check