Merge pull request #2755 from vbystricky:oclopt_LUT
Merge pull request #2785 from akarsakov:ocl_pyrDown_borders
optimized cv::norm with NORM_INF
fixed calculation method of "cv::TickMeter"
export BOW to script wrappers
optimized cv::norm with 2 args
optimized cv::norm with NORM_RELATIVE
fixes
moving FaceRecognizer2 from public header to .cpp
Merge pull request #2818 from StevenPuttemans:fix_linux_tutorial
Merge pull request #2831 from alalek:android_examples
Merge pull request #2822 from timedia:akaze-java
Merge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4
Merge pull request #2817 from bf:patch-1
fixed warnings
Merge pull request #2813 from 23pointsNorth:patch-2
fixed possible runtime error
bixed cv::boxFilter
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/contrib/src/spinimages.cpp
added norm_inf support to minmaxloc kernel