Merge branch master into cuda-dev

diff --cc modules/gpu/include/opencv2/gpu/device/utility.hpp
Simple merge

diff --cc modules/gpu/src/cuda/integral_image.cu
Simple merge

diff --cc modules/gpu/src/cuda/surf.cu
Simple merge

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

diff --cc modules/gpu/src/surf.cpp
Simple merge

diff --cc modules/gpu/test/test_video.cpp
Simple merge

diff --cc modules/highgui/src/precomp.hpp
Simple merge