Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp

(#2569) simplifying code to avoid Eclipse CDT editor confusion, removing warnings and typos in comments

Face detection package name replaced on org.opencv.facedetect for consistency with Google Play package.

Revision 8725 restored. Android sample FaceDetection updated according DetectionBasedTracker interface.

revision 8721 vas merged to head. Detection based tracker interface changed. cpp and android samples updated.

Warning: changes beak binary compatibility