Added smile detector
Update samples/c/smiledetect.cpp

- Changed to floating neighbor maximum mode
- Fixed some previous errors.
Update samples/c/smiledetect.cpp

Fixed isdigit() Android build error
Fix OpenCVConfig.cmake generated for Android platform (issue #2496)

* fix path to libraries in Android SDK
* allow to link to opencv_java.so as Android.mk does

To link to opencv_java.so you can either change your cmake to find OpenCV as

    find_package(OpenCV opencv_java)

or pass -DOpenCV_FIND_COMPONENTS=opencv_java to your cmake command
fix the blend crash in some cases
adjust some test cases, use original template file name in Haar
fix bug #2787
Fix ocl::bruteforcematcher crash on Intel OCL
linux warning fix
Fix ocl::HOG crash on Intel OCL
OpenCV version swithed to 4 digit in GUI and package revision number.
Merge pull request #582 from bitwangyaoyao:2.4_fixBlend
Merge pull request #584 from bitwangyaoyao:2.4_perfTest
Merge pull request #572 from asmorkalov:manager_4_digit_version
Merge pull request #570 from taka-no-me:fix_android_cmakeconfig
adding/fixing version suffix for desktop java library on all OSes
updating samples to load JNI lib with correct suffix
Honor 2-digit python version
fixed gpu sanity tests
adding more version-related variables