Merge branch 'master' of https://github.com/iFuSiiOnzZ/MultiKinectMoCap

Conflicts:
	kinect/CKinect.cpp
	kinect/CKinect.h
	kinect/CKinectManager.cpp
	kinect/CKinectManager.h
	openGL/OGLDebugRender/OGLDebugRender.cpp
	openGL/OGLDebugRender/OGLDebugRender.h
	openGL/OGLMain.cpp
	openGL/OGLMath/OGLMatrix4f.cpp
	openGL/OGLMath/OGLMatrix4f.h
	openGL/OGLMath/OGLVector3f.cpp
	openGL/OGLMath/OGLVector3f.h