calibration tests
Merge branch 'master' of github.com:matoilic/thesis

Conflicts:
	ARDoor/ARDoor.pro.user
	CameraCalib/CameraCalib.pro.user
	CameraCalibTest/CameraCalibTest.pro.user