ignore file
Merge branch 'master' of http://github.com/NexZhu/Yanphone-Client-iOS

Conflicts:

iOSClient.xcodeproj/project.xcworkspace/xcuserdata/Yuanfang.xcuserdatad/
UserInterfaceState.xcuserstate
tmp
Merge branch 'master' of http://github.com/NexZhu/Yanphone-Client-iOS