update Cocos2d
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop
Merge pull request #190 from jtwigg/develop

Develop