merge from cocos2d-js  master