maj
Merge branch 'master' of https://github.com/Fluwed/DevMultimedia

Conflicts:
	TestTracking/webcamwindow.cpp