Same as other
Things are working again!!
Merge branch 'alternate'

Conflicts:
	client/Rules.make
	client/main.c
	client/src/devtypes.h
	client/src/devtypes.h~
	client/src/usb-operations.c