allows building with -std=c++11 under G++
Remove the perf running from ocl::matchTemplate accuracy tests
fix the haar kernel problems on Nvidia and Intel OCL
some cleanup
fix mismatch of WarpAffine
remove the empty implementation when HAVE_OPENCL not defined
Update doc/tutorials/core/adding_images/adding_images.rst

Quick fix for: http://code.opencv.org/issues/2803
Merge pull request #536 from bitwangyaoyao:2.4_fixHaar
Merge pull request #535 from bitwangyaoyao:2.4_clean
Merge pull request #537 from bitwangyaoyao:2.4_fixWarpAffine
Merge pull request #538 from NCBee:patch-2
Merge branch 2.4
restore missed gpu functionality after merge #dddd285d
Merge pull request #534 from emchristiansen:c++11
minor fix in docs
Merge branch 'master' of git://code.opencv.org/opencv