Openni2 support
Merge remote-tracking branch 'origin/master' into Openni2Support

Conflicts:
	modules/highgui/CMakeLists.txt
	modules/highgui/include/opencv2/highgui.hpp
	modules/highgui/include/opencv2/highgui/highgui_c.h
Openni2 support
Merge pull request #2919 from larshg:Openni2Support