临时提交
Merge branch 'master' of https://github.com/Emck/GfanSDKiOSDemo

Conflicts:
	GfanSDKDemo.xcodeproj/project.pbxproj