added OpenCL version of cv::scaleAdd
converted CPU-based example to T-API (Mat 2 UMat, etc)
eliminate MINGW pragma warning
fix
Merge pull request #2092 from alalek:fix_mingw_warn
Merge commit 'f22d9a23' into merge-2.4 (-s ours)
Merge commit '83cdd43a' into merge-2.4

Conflicts:
	modules/core/include/opencv2/core/version.hpp
Merge commit 'edce617a5' into merge-2.4 (-s ours)
Merge commit '1acc1085d' into merge-2.4
Merge commit '24be7b26c' into merge-2.4 (-s ours)
Merge commit 'b94963d38' into merge-2.4

Conflicts:
	cmake/OpenCVGenAndroidMK.cmake
Merge commit '8fe79738c' into merge-2.4
Merge commit '60906d917' into merge-2.4

Conflicts:
	modules/ts/src/cuda_perf.cpp
fixed bug #3341
Merge commit '709e8e8e0' into merge-2.4
Merge commit '4b885e206' into merge-2.4
Merge commit 'ee36717d' into merge-2.4
Merge commit '719149877e' into merge-2.4 (-s ours)
Merge commit '0566ab4d3d' into merge-2.4

Conflicts:
	modules/core/src/system.cpp
Merge commit '46be47cb4b8' into merge-2.4 (-s ours)