Changed color calibration strategy
Merge branch 'colortrack' of https://github.com/jlfranco/gts into colortrack

Conflicts:
	app/src/tracking/ColorCalibration.cpp