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

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