Correct CCButtons defaultSerialization
Update cocos2d version
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop
Merge pull request #184 from jtwigg/develop

Develop