Updates for OpenCV 3 api (keeping OpenCV 2 back compatibility)

Updates for OpenCV 3 api (keeping OpenCV 2 back compatibility).

Tested with:

• OpenCV 2.4.9
• OpenCV 3.1

(working with both 2 and 3 major versions).

Main changes:

• New paths for includes.
• Detectors/descriptors new api.

src/examples/CMakeLists.txt

@@ -113,14 +113,12 @@ IF(OpenCV_FOUND)
     ENDIF(Ceres_FOUND)
 
     # Testing opencv matching and fundamental matrix with ransac
-#    ADD_EXECUTABLE(test_opencv test_opencv.cpp)
-#    TARGET_LINK_LIBRARIES(test_opencv ${PROJECT_NAME})
+    ADD_EXECUTABLE(test_opencv test_opencv.cpp)
+    TARGET_LINK_LIBRARIES(test_opencv ${PROJECT_NAME})
 
     # Testing OpenCV functions for projection of points
-#    ADD_EXECUTABLE(test_projection_points test_projection_points.cpp)
-#    TARGET_LINK_LIBRARIES(test_projection_points ${PROJECT_NAME})
-
-
+    ADD_EXECUTABLE(test_projection_points test_projection_points.cpp)
+    TARGET_LINK_LIBRARIES(test_projection_points ${PROJECT_NAME})
 
     # Constraint test
     ADD_EXECUTABLE(test_constraint_AHP test_constraint_AHP.cpp)