1，save
save
save
save
save
save
Merge remote-tracking branch 'origin/master'

Conflicts:
	Pods/Pods.xcodeproj/xcuserdata/gaohuang.xcuserdatad/xcschemes/Pods-AFNetworking.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/gaohuang.xcuserdatad/xcschemes/Pods-JSONModel.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/gaohuang.xcuserdatad/xcschemes/Pods-MarqueeLabel.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/gaohuang.xcuserdatad/xcschemes/Pods-SDWebImage.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/gaohuang.xcuserdatad/xcschemes/Pods-SVProgressHUD.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/gaohuang.xcuserdatad/xcschemes/Pods-UMengFeedback.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/gaohuang.xcuserdatad/xcschemes/Pods-UMengMessage.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/gaohuang.xcuserdatad/xcschemes/Pods-libqrencode.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/gaohuang.xcuserdatad/xcschemes/Pods.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/gaohuang.xcuserdatad/xcschemes/xcschememanagement.plist
	Pods/Pods.xcodeproj/xcuserdata/stsw.xcuserdatad/xcschemes/Pods-AFNetworking.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/stsw.xcuserdatad/xcschemes/Pods-JSONModel.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/stsw.xcuserdatad/xcschemes/Pods-MarqueeLabel.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/stsw.xcuserdatad/xcschemes/Pods-SDWebImage.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/stsw.xcuserdatad/xcschemes/Pods-SVProgressHUD.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/stsw.xcuserdatad/xcschemes/Pods-libqrencode.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/stsw.xcuserdatad/xcschemes/Pods.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/stsw.xcuserdatad/xcschemes/xcschememanagement.plist
save
save
save
save