fix categories and masks not saving.
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop
Merge pull request #434 from jtwigg/develop

fix categories and masks not saving.
Updates Cocos2D
The Cocos2D change that you cannot live without