merge from cocos2d-x

merge from cocos2d-x