converted old haar cascades to the new format; added the conversion function; added...

diff --cc modules/core/include/opencv2/core/ocl.hpp
Simple merge

diff --cc modules/imgproc/include/opencv2/imgproc.hpp
Simple merge

diff --cc modules/imgproc/src/smooth.cpp
Simple merge