Added fix in CMakeLists.txt for contrib module.
Native camera libraries updated.

Android 4.3 support added;
ANY camera index support fixed;
applyProperties now uses camera->reconnect() instead close/connect for Android 4.x.
(cherry picked from commit fff91eef0bd301e791173259ccf884c23397c956)
New Tegra detector with Android 4.3 support added. Manager version++.
(cherry picked from commit aa00b5a0ab3d7289af8ab2006f8521fd3ed17e92)

Conflicts:

	platforms/android/service/engine/jni/BinderComponent/TegraDetector.cpp
OpenCV version++. Current OpenCv version 2.4.6.2
fix for bug #3219 (undefined reference in GPU samples)
Updated with comments of speclad
Bug #1890 Opencv 2.4.0 with QT 4.7.4 and cvcreatebutton exception fixed.

QVector range check exception fixed.
fix #3296 : Unsupported gpu architecture 'compute_21'
Record OpenCV build type among the test properties.

Because apparently I love running performance tests for debug builds.
Merge pull request #1620 from SpecLad:record-build-type
In Java bindings, wrap version constants into functions to prevent inlining.

Java inlines static finals if they're defined with a constant expression. In
case of version constants we don't want that to happen, since they obviously
change from version to version. If the user substitutes a different OpenCV
jar without recompiling, we want user code to still have relevant values for
the version constants.

This arranges that by turning constant values into function calls, which no
longer count as a constant expression.
Delete an import of junit.framework.Assert, which is deprecated in JUnit 4.x.

We don't use it, anyway.
Merge pull request #1627 from SpecLad:java-version-no-inline
Merge pull request #1630 from SpecLad:java-deprecated-assert
cmake: restore find_package() for build directory
Merge pull request #1375 from jet47:gpu-examples-build
cmake: add opencv_java into list of exported targets (fix for android)
cmake: fix linker deps for CUDA
Fix running Java tests with run.py on everything other than Windows.

Previously, run.py would assume that the opencv_java library is in the
same directory as the tests, which is only true on Windows.

The library path depends on the build configuration, which may not be
known until the actual build (e.g. with the Visual Studio generators),
so it can't be stored in the CMake cache for run.py to read. I didn't
want to hardcode into run.py where the library is on each platform,
either. So that's why I used the current scheme with the properties
file. It also makes running the tests without run.py a little easier.
ocl: rewrite CvtColor tests, added roi support