core: added cv::error with CV_NORETURN attr
ts/perf: int -> enum WarmUpType
Merge pull request #1910 from alalek:ts_perf_warmuptype
Merge pull request #1891 from alalek:cv_error_noreturn
Some tests for UMat
Merge branch 'umat_tests' of git://github.com/KonstantinMatskevich/opencv into umat_tests

Conflicts:
	modules/core/test/test_umat.cpp