merge
Merge branch 'client' into develop

Conflicts:
	XinYuanERP.xcodeproj/project.pbxproj