Merge remote-tracking branch 'master' into stitch-fix

* 'master' of github.com:itseez/opencv: (82 commits)
  moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
  added some basic functionality needed by the new face module (moved from the old "contrib")
  moved to the new opencv_contrib/face module
  fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
  Fixed review comment from Vadim Pisarevsky
  modified farneback sample to use T-API
  ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
  small fix for GaussianBlur ocl test
  fix binary package build
  small fix for ocl_resize
  fix IOS framework
  fixed test ocl_MatchTemplate for sparse matrix
  Fixed typos
  fixing error, wrong template method param.
  fixing Mac build
  some formal changes (generally adding constness)
  Fixed choice of kercn and rowsPerWI for non-Intel device.
  fixed nDiffs for CalcBackProject
  fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
  Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
  ...

Conflicts:
	modules/core/include/opencv2/core/mat.inl.hpp

diff --cc modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
Simple merge

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

diff --cc modules/core/include/opencv2/core/mat.inl.hpp
index b22c041,c240aca..5bc67ed
--- 1/modules/core/include/opencv2/core/mat.inl.hpp
--- 2/modules/core/include/opencv2/core/mat.inl.hpp
+++ b/modules/core/include/opencv2/core/mat.inl.hpp
@@@ -642,9 -642,8 +642,9 @@@ inline void Mat::release(
      if( u && CV_XADD(&u->refcount, -1) == 1 )
          deallocate();
      u = NULL;
-     data = datastart = dataend = datalimit = 0;
+     datastart = dataend = datalimit = data = 0;
 -    size.p[0] = 0;
 +    for(int i = 0; i < dims; i++)
 +        size.p[i] = 0;
  }
  
  inline

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