OpenCV-3 compatibility changes

Mainly different flags that need to be accounted for.
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/dir-reader/CMakeLists.txt