commit
Merge branch 'master' of github.com:juniperdiego/usbW
modify our database instead of the original one
Merge branch 'master' of github.com:juniperdiego/usbW
resolve the confilcts

Conflicts:
	dataupdate.cpp
	gengxin.cpp