+):代码提交
Merge branch 'GSM_Branches_V1.0_20141027'

Conflicts:

GSM_IOS.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/UserI
nterfaceState.xcuserstate