Merge pull request #177 from jtwigg/develop

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