some changes
Merge branch 'UvcImageGenerator' of
git@github.com:Ingener74/USB-Camera-Viewer.git into UvcImageGenerator

Conflicts:
	USBDeviceViewer/jni/USBCameraViewer.cpp

	fix merge, fuck my ass