Merge pull request #2515 from apavlenko:perf_default_strategy
Merge pull request #2513 from asmorkalov:ocv_cuda_link_revert
Merge pull request #2504 from asmorkalov:android_camera_locks_24
Merge pull request #2514 from asmorkalov:android_two_libs_cuda
Fixed "Mat mask operations" tutorial. Thanks @RJ2 for pointing this.
added 3-channels support to cv::Canny
Merge pull request #2520 from vlkolesnikov:misprint_fix
added 3 channels support to cv::bilateralFilter

Conflicts:
	modules/imgproc/test/ocl/test_filters.cpp
added 3-channels support to cv::boxFilter, cv::blur, cv::sqrBoxFilter
added 3-channels support to cv::filter2D, cv::Laplacian
added 3-channels support to cv::medianBlur
refactored filter2D; eliminated restrictions sdepth == ddepth, delta == 0
case-insensitivity
eliminated restriction delta == 0 from cv::sepFilter2D
Removed obsolete list from docs
Merge pull request #2512 from KonstantinMatskevich:ocl_gpu_type_parser
Merge pull request #2516 from Daniil-Osokin:fix_docs
Merge pull request #2521 from atrebbi:#3620
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	cmake/OpenCVDetectAndroidSDK.cmake
	cmake/OpenCVGenAndroidMK.cmake
	cmake/OpenCVModule.cmake
	cmake/templates/OpenCV.mk.in
	cmake/templates/OpenCVConfig.cmake.in
	doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
	modules/cudabgsegm/src/cuda/mog.cu
	modules/imgproc/perf/opencl/perf_filters.cpp
	modules/imgproc/src/opencl/filterSep_singlePass.cl
	modules/nonfree/CMakeLists.txt
	modules/nonfree/perf/perf_precomp.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/opencl/bgfg_mog.cl
	modules/superres/CMakeLists.txt
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/cuda/btv_l1_gpu.cu
	modules/superres/src/frame_source.cpp
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/optical_flow.cpp
	modules/superres/src/precomp.hpp
	samples/gpu/CMakeLists.txt
	samples/gpu/brox_optical_flow.cpp
	samples/gpu/super_resolution.cpp
Merge pull request #2522 from ilya-lavrenov:tapi_canny