Merge pull request #929 from cocojoe/develop

Issue Fix Instant Ease
Fixes compiler warning
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop
support Swift classes in CCBReader
Merge pull request #947 from collinjackson/develop

support Swift classes in CCBReader