commit for update

commit for update
Merge branch 'master' of https://github.com/fankejun/CRM

Conflicts:
	CRM.xcodeproj/project.pbxproj