Updates cocos2d-x
Merge branch 'develop' into sample_ccbproj
Merge branch 'sample_ccbproj' of github.com:gdagley/cocos2d-frame into sample_ccbproj