will be delete
Merge branch 'master' of https://github.com/lijianping/repast

Conflicts:
	ComMainCateForm.cpp
	DBForm.cpp
	DBForm.h
	basic_info.cpp
Merge branch 'master' of https://github.com/lijianping/repast
nothing
Merge branch 'master' of https://github.com/lijianping/repast
nothing more
Merge branch 'master' of https://github.com/lijianping/repast

Conflicts:
	LoginForm.cpp
	login.cpp
add Commodity_
Merge branch 'master' of https://github.com/lijianping/repast