Prepare unit test for CalibrationModule, bug at feature comparaison in compareObject
Merge branch 'master' of github.com:lwinkler/markus into dev_Rossier_CalibrationByModel

Conflicts:
	vp-detection
Merge branch 'master' into dev_Rossier_CalibrationByModel

Conflicts:
	vp-detection
Create a performance.xml file to summarize runtime fps and timers
Remove useless debug message, project testing inside CalibrationBy3DModel is now working
Merge branch 'dev_Rossier_CalibrationByModel' of github.com:lwinkler/markus into dev_Rossier_CalibrationByModel
resolve conflit (taking change from master)
Conflicts:
	bulk/ControllerModule.cpp
	bulk/Manager.cpp
	bulk/Module.cpp
	bulk/Module.h
	bulk/ModuleAsync.cpp
	bulk/ModuleAsync.h
	vp-detection
Merge branch 'dev_lwk5' into dev_Rossier_CalibrationByModel

Conflicts:
	vp-detection
Serialize objects using the new methods in Read and LogObjects