lots of stuff
Merge branch 'master' of https://github.com/Pcgell/animated-octo-dubstep

Conflicts:

cocosDragon.xcodeproj/project.xcworkspace/xcuserdata/kenneth.xcuserdatad
/UserInterfaceState.xcuserstate