＋）：更新
Merge branch 'GSM_Branches_V1.0_20141027' of https://github.com/zttgsm/gsm into GSM_Branches_V1.0_20141027

Conflicts:

GSM_IOS.xcodeproj/project.xcworkspace/xcuserdata/shirley.xcuserdatad/Use
rInterfaceState.xcuserstate
	GSM_IOS/ZTTOrderParamDetailsViewController.xib
Merge branch 'GSM_Branches_V1.0_20141027' of https://github.com/zttgsm/gsm into GSM_Branches_V1.0_20141027
Merge branch 'GSM_Branches_V1.0_20141027'
+）：提交