Merge remote-tracking branch 'lipeng/remote/master' into branch2
Merge branch 'branch2'
修改了TOOL
Merge branch 'master' of https://github.com/jacklibonnie/ios-demo

Conflicts:
	ScreenShow/我/MyStoryBoard.storyboard
Merge remote-tracking branch 'lipeng/master' into temp
  第三方登录基本完成，服务器差token字段
实现登录后绑定和解除绑定
Merge remote-tracking branch 'lipeng/remote/master'
Merge branch 'branch'
Merge remote-tracking branch 'liuyangjie/master' into liuyangjie
合并绑定
通过修改友盟授权页的弹出方式，修复了NavigationBar覆盖statusBar的BUG
nothing
mergeconflicts
Merge branch 'branchtmp'