added guard against linking qt5 and VTK together
modified viz module header layout for 2.4 compatibility
drawing
features2d
fixes
fixed docs
removed CV_IN/OUT
fixed docs2
fixes2
implemented umat expressions
added perf test
Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray
condition for Mat step
Merge pull request #2269 from Nerei:qt5_vtk_guards
Merge pull request #2289 from ilya-lavrenov:umat_expr
Merge pull request #2287 from ilya-lavrenov:mat_step
Merge branch 'master' of https://github.com/Itseez/opencv.git