more work on deviceproxy/usbdevice
Merge branch 'master' of https://github.com/dominicgs/usb-mitm

Conflicts:
	Makefile