merge cocos2d-x