opencv webcam
Merge branch 'master' of https://github.com/xorver/mikro

Conflicts:
	webcam/Makefile