a
Merge branch 'master' of https://github.com/ALX5/PJS

Conflicts:
	src/Distortion/TestSurface.cpp
Calibration of Xtion added with file Calib.*
Merge branch 'master' of https://github.com/ALX5/PJS

Conflicts:
	src/CMakeLists.txt
	src/Distortion/HomographyCalculator.cpp
	src/Distortion/HomographyCalculator.h
	src/Distortion/Plane2d.cpp
	src/Distortion/Plane2d.h
	src/Distortion/Surface.cpp
	src/Main.cpp