Calibration
Merge branch 'calibration'

Conflicts:
	src/VisualOperations.cpp