updated test data for gpu::FastNonLocalMeans
updating sanity check data due to test images change
Merge pull request #16 from apavlenko/warp_sanity_check

updating sanity check data due to test images change
Added sanity data for cvtColorBayer8u test
Merge branch '2.4'

Conflicts:
	testdata/perf/imgproc.xml
Merge pull request #17 from branch jet47:gpu-fast-nlm
Merge branch '2.4'
updated sift test data; added images for the planar object detector test
Merge branch 'sift_fixes' of https://github.com/vpisarev/opencv_extra into 2.4
Added test data for HoughLines regression test
Merge pull request #18 from ivan-korolev/fix_HoughLines_segfault
Merge branch 'origin/2.4'
updated data for SURF regression tests
updated nonfree/surf data for the sanity check mode in the performance tests
Merge branch vpisarev:surf_fixes
Merge branch '2.4'
Merge branch AnnaKogan8/fixed-perf-tests into 2.4
added haarcascade_frontalface_default.xml
Merge vpisarev/facedetect_fixes into 2.4
Merge branch '2.4'