Merge pull request #1 from cocos2d/master

update with cocos2d/cocos2d-html5