test
Merge branch 'branch'
hj
登录之后第三方绑定界面

登录之后第三方绑定界面（绑定和接触绑定还没完成）
Merge branch 'branch1'
Merge branch 'branch1'
合并liuyanjie
Merge branch 'branch1'
Merge remote-tracking branch 'lipeng/remote/master' into branch2
Merge branch 'branch2'
Merge branch 'master' of https://github.com/jacklibonnie/ios-demo

Conflicts:
	ScreenShow/我/MyStoryBoard.storyboard
Merge remote-tracking branch 'lipeng/master' into temp
添加了视频左右切换的图片，初始化选择礼物界面的labeltext
解决了送礼界面的冲突
  第三方登录基本完成，服务器差token字段
实现登录后绑定和解除绑定
Merge remote-tracking branch 'lipeng/remote/master'
Merge branch 'branch'
Merge remote-tracking branch 'liuyangjie/master' into liuyangjie
合并绑定