进度说明

Client 进度说明
Merge branch 'master' of https://github.com/xupingmao/VersionControl

Conflicts:
	.settings/org.eclipse.core.resources.prefs