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

Conflicts:
	resource.h