update
Merge branch 'master' of https://github.com/cxjwin/cxjwin_sinaweibo

Conflicts:

SinaWeibo.xcworkspace/xcuserdata/cxjwin.xcuserdatad/UserInterfaceState.x
cuserstate