Signed-off-by: Oliver <Oliver@Oliver>
Merge branch 'master' of https://github.com/emilhein/CDIOROBOT.git

Conflicts:
	ImageTest/src/main/MainTest.java
Merge branch 'master' of https://github.com/emilhein/CDIOROBOT.git
Signed-off-by: Oliver <Oliver@Oliver>
Signed-off-by: Oliver <Oliver@Oliver>
Merge branch 'master' of https://github.com/emilhein/CDIOROBOT.git

Conflicts:
	ImageTest/src/Controller/PrimaryController.java