pose estimation
Merge branch 'master' of github.com:matoilic/ardoor
Merge branch 'master' of github.com:matoilic/ardoor
pattern extractor
Merge branch 'master' of github.com:matoilic/ardoor

Conflicts:
	Libraries/ARDoorCommon/CameraCalibration.cpp
	Libraries/ARDoorCommon/CameraCalibration.h
compilation options for mac