merge  from cocos2d

merge