modify project
modify classify
add umsocial
Merge branch 'master' of https://github.com/onean/cupup

Conflicts:
	Cupup/Cupup.xcodeproj/project.pbxproj

Cupup/Cupup.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/U
serInterfaceState.xcuserstate