merge with cocos2d-x

merge with cocos2d-x