increase epsilon for GEMM & Convolve sanity tests for CUDA 5.5
Fix building the iOS framework after I dropped the VERSION macro.

This version uses CMake to generate Info.plist, which should be more
reliable than the old approach.
Comparing rejected stage index with minimum required neighbors does not make sense

As described here, http://code.opencv.org/issues/3064, the test before
led to a case where we compared the index of the latest stage at which a
rectangle was rejected with the minimum number of neighbors required as
specified in `detectMultiScale`. Please see the issue for more
information.
Merge pull request #3 from Itseez/2.4

OpenCV changes
fixed gpu cvtColor for BGR <-> YUV
added cvconfig.hpp header file to gpu tests

it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
fixed gpu BGR <-> YUV color conversion
Merge pull request #1293 from jet47:gpu-cvtcolor-fix
Merge pull request #1294 from jet47:gpu-tests-fix
Merge pull request #1296 from jet47:gpu-cvtcolor-fix-master
Fixed incorrect extension on 3rdparty/libpng/opencv-libpng.patch.
eliminate unnecessary double arithmetics in CUDA
Typo in Java generator fixed.

Typo breaks debug build for Android platform.
Merge pull request #1301 from asmorkalov:java_video_capture_fix
Merge pull request #1297 from SpecLad:merge-2.4
Fix the name of perf tests' precompiled header.

(cherry picked from commit aa96d8d053c3d0c367da7c1c1f9c73ed376b3bfa)
fixed gpu bitwize operation:

incorrect types for template instantiation
Merge pull request #1298 from jet47:gpu-eliminate-doubles
Allow to read PNG image of color_type PNG_COLOR_TYPE_PALETTE with alpha channel
Correct reading PNG color type palette with or without alpha imread flags -1 or 1
Better not using pnginfo.h, using png_get_tRNS instead
added cvconfig.h header, because ts_perf.cpp uses HAVE_CUDA macros