Knap 2
Merge branch 'master' of https://github.com/emilhein/CDIOROBOT.git

Conflicts:
	ImageTest/src/CallibratorGUI/CallibratorGUI.java