A fusionner
Merge branch 'master' of github.com:Amxx/MDMA

Conflicts:
	code/henri/openni2/kinect.cpp