Updates Cocos2d
Merge branch 'develop' of github.com:apportable/SpriteBuilder into develop