Merge pull request #961 from PeterMinin:detected_objects_weight
Merge pull request #856 from ericgreveson:master
Merge pull request #958 from apavlenko:fix_java_mixchannels
fixed documentation build
Revert "Add a variant of detectMultiScale with an argument 'weights'"

It was merged by mistake.

This reverts commit ab6be9b7b7691967e42297aa6d3a67fb07597fd8.
added missing <iostream> header
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Merged pull requests:
	#890 from caorong:patch-1
	#893 from jet47:gpu-arm-fixes
	#933 from pengx17:2.4_macfix_cont
	#935 from pengx17:2.4_filter2d_fix
	#936 from bitwangyaoyao:2.4_perf
	#937 from bitwangyaoyao:2.4_fixPyrLK
	#938 from pengx17:2.4_surf_sample
	#939 from pengx17:2.4_getDevice
	#940 from SpecLad:autolock
	#941 from apavlenko:signed_char
	#946 from bitwangyaoyao:2.4_samples2
	#947 from jet47:fix-gpu-arm-build
	#948 from jet47:cuda-5.5-support
	#952 from SpecLad:jepg
	#953 from jet47:fix-bug-3069
	#955 from SpecLad:symlink
	#957 from pengx17:2.4_fix_corner_detector
	#959 from SpecLad:qt4-build
	#960 from SpecLad:extra-modules

Conflicts:
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/CMakeLists.txt
	modules/gpu/include/opencv2/gpu/device/vec_math.hpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuimgproc/src/cuda/hough.cu
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/pyrlk.cpp
	samples/gpu/driver_api_multi.cpp
	samples/gpu/driver_api_stereo_multi.cpp
	samples/ocl/surf_matcher.cpp
Merge pull request #968 from asmorkalov:android_na_cproj_fix
Merge pull request #974 from jet47:gpu-core-refactoring
Use anonymous enumerations instead of constants
Merge pull request #975 from SpecLad:merge-2.4
Merge pull request #899 from LeszekSwirski:fix-drawingdoc
Merge pull request #903 from aks2:2.4
refactored VideoWriter class (convert it to abstract interface)
refactored VideoReader (convert it to abstract interface)

also refactored VideoSource interface (made it simplier, now it has only 2 abstract methods)
switched to Input/Output Array in gpu::add
switched to Input/Output Array in gpu::subtract
added arithm_op function to reduce code duplication
switched to Input/Output Array in gpu::multiply
switched to Input/Output Array in gpu::divide