Signed-off-by: Sædvanlige ændringer :D <Emil@10.16.106.85>
Merge branch 'master' of https://github.com/emilhein/CDIOROBOT.git

Conflicts:
	ImageTest/src/CallibratorGUI/CallibratorGUI.java


Signed-off-by: Sædvanlige ændringer :D <Emil@10.16.106.85>
Signed-off-by: Sædvanlige ændringer :D <Emil@10.16.106.85>
Merge branch 'master' of https://github.com/emilhein/CDIOROBOT.git
Signed-off-by: Sædvanlige ændringer :D <Emil@10.16.106.85>