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

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

Conflicts:
	main.cpp
	service.cpp
Merge branch 'master' of https://github.com/lijianping/repast
vvv