Hi
Merge branch 'master' of https://github.com/musiczone/weibo_ios_sdk_sso-oauth

Conflicts:
	WeiboSDKDemo/WeiboSDKLibDemo.xcodeproj/project.pbxproj