modified
Merge branch 'master' of https://github.com/belafonte/3DScanner

Conflicts:
	CamCalib.cpp
	RunScanner.cpp
Added DistCoeffs and Intrinsic to scanParams