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

Conflicts:
	manager.cpp
	resource.h