git shan
Merge branch 'master' of https://github.com/zzlmilk/008App

Conflicts:
	.DS_Store
	008.xcodeproj/project.pbxproj
	008/Controllers/UserViewContrllers/UserLoginViewController.h
	008/Controllers/UserViewContrllers/UserLoginViewController.m
	008/ThirdParty/SinaWeiboSDK/.DS_Store
	008/ThirdParty/SinaWeiboSDK/WeiboSDK.bundle/images/close.png
	008/ThirdParty/SinaWeiboSDK/WeiboSDK.bundle/images/close@2x.png
	008/ThirdParty/SinaWeiboSDK/WeiboSDK.h