working on twitter oauth
Merge branch 'master' of https://github.com/dymx101/GageinMobile

Conflicts:

iOS/Gagein/Gagein.xcodeproj/project.xcworkspace/xcuserdata/dongyiming.xc
userdatad/UserInterfaceState.xcuserstate