fix thin-prism coefficients at 0's in the stereo calibration function unless the flag CALIB_THIN_PRISM_MODEL is explicitly set

I didn't make the status part of the version variables here, because
letters don't play too well with version comparison algorithms
(especially with CMake's, which only supports numbers).

This will allow us to distinguish between regular releases, prereleases
and development versions.

Conflicts:
	.gitignore
	doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
	modules/gpu/src/match_template.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_precomp.hpp

Previously we incorrectly assumed data was aligned in 16 bytes, which should be 32.

it conflicts with cv::detail

changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.