change
Merge branch 'master' of https://github.com/lijianping/repast
merge serviec.cpp

Conflicts:
	service.cpp