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.