uncomment surf code
Add opencv_nonfree to cmake file
uncomment most of surf