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

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

Conflicts:
	resource.h