Updated Cocos2d and CCBReader to latest versions
Merge branch 'master' into develop