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

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

Conflicts:
	basic_info.cpp
	basic_info.h
	resource.h
	service.cpp