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

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

Conflicts:
	manager.cpp
	manager.h
	resource.h
	resource.rc