sync with cocos2dx

sync with cocos2dx