Merge pull request #216 from jtwigg/develop

Develop
Updates Cocos2d
Merge branch 'develop' of github.com:apportable/SpriteBuilder into develop
Fixes #193
Clear textures when content scale changes.
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop