upd
Merge branch 'master' of https://github.com/vortex314/micro

Conflicts:
	Linux/inc/Usb.h
	Linux/src/Usb.cpp
	usb/usb.depend
	usb/usb.layout
upd