Update Scripts and usb-modeswitch
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.svn/wc.db