merge cocos2d/cocos2d-x