Fixed typos in "matching"
Merge branch '2.4' into fixtypos
Fixed typo in BFMatcher in docs.
Bug #3553 JavaCameraView frame format and cvtColor format inconsistency fixed.
Merge pull request #2540 from mjul:fixtypos_2.4
Merge pull request #2539 from mjul:fixtypos
Merge pull request #2542 from asmorkalov:android_javacam_cvtcolor_fix
Revert "Merge pull request #1779 from perping:integral_2.4"

This reverts commit 54ea5bbac77a9dbd10f314ee1ee2b10e3b6c44fa, reversing
changes made to 28e0d3d771d9db9d03ea55f8d0504558e17139b2.
- fix test
Revert pull request #1929 from @alalek "ocl: added workaround into Haar kernels"

This reverts commit 3dcddad88aa13b729313939648c29f420a9f8054.

Conflicts:
	modules/ocl/src/opencl/haarobjectdetect.cl
OpenCVConfig.cmake fix after cutting absolute CUDA libraries path.
Merge pull request #2534 from asmorkalov:opencv_config_cut_cuda_abs_path
Merge pull request #2543 from apavlenko:24_haar_revert