Merge pull request #6 from liop/master

liop'修改第三方登录的实现
delete .ds_store

delete .ds_store
test
ss
no message
Merge branch 'temp'

Conflicts:
	ScreenShow/ScreenShow.xcodeproj/project.xcworkspace/xcuserdata/fab.xcuserdatad/UserInterfaceState.xcuserstate
test

testtest
Merge branch 'branch'
xx
Merge remote-tracking branch 'lipeng/remote/master'
测试
Merge branch 'master' of https://github.com/jacklibonnie/ios-demo into liop-test2
nothing
修改了没有数据时候下拉刷新不能返回的bug
1、加第三方绑定

1、加第三方绑定
Merge branch 'liop-test2'
Merge branch 'master' of https://github.com/FABliuyanjie/ios-demo into branch
Merge branch 'branch'
nothing
解决了storyboard的冲突