add updatechildcate
add Commodity
Merge branch 'master' of https://github.com/lijianping/repast

Conflicts:
	DBForm.cpp
	Err.cpp
	Err.h
	resource.h
Merge branch 'master' of https://github.com/lijianping/repast