Corrected OpenCV and ZBar paths
Merge branch 'VS' of https://github.com/kipr/libkovan into VS

Conflicts:
	CMakeLists.txt