minor refactoring of Android VideoCapture jni code to make it similar to generated one
fixed warnings in ocl kernels
fixed ocl::Moments test
fixed a bug of haar.
Merge pull request #1728 from apavlenko:refactor_vcap_jni
Merge pull request #1730 from ilya-lavrenov:ocl_kern_warn
Merge pull request #1729 from ilya-lavrenov:ocl_moments
remove whitespace.
ocl: fix testdata for blendLinear
consistency SSE2 and plain versions of convertMaps and remap
OpenCV Version++. OpenCV Manager Version++.
Merge pull request #1732 from alalek:ocl_blendLinear
Merge pull request #1733 from ilya-lavrenov:cv_remap
ocl: corner*: fix memory access in kernels; change error check to relative
Merge pull request #1734 from asmorkalov:android_manager_version_inc
Merge pull request #1731 from perping:2.4_haar
Merge pull request #1736 from alalek:ocl_fix_corner_memory_access