updated sanity data for ocl::norm
Merge pull request #79 from ilya-lavrenov:ocl_perf_norm
added dummy sanity data for ocl::HoughCircles
Merge pull request #80 from ilya-lavrenov:ocl_hough_circles
Merge branch '2.4'

Conflicts:
	testdata/perf/ocl.xml