fixed typo
Merge pull request #1538 from asalga/master

fixed typo
Merge pull request #1648 from xingsenma/develop-3.0

issue #4221 add richText
Issue #4277: fixed cc.eventManager, cc.Texture2DCanvas and EGLView's bug
Merge branch 'develop-3.0' of git://github.com/cocos2d/cocos2d-html5 into Iss4277_FixBugsForV3.0
Merge pull request #1649 from dingpinglv/Iss4277_FixBugsForV3.0

Issue #4277: fixed cc.eventManager, cc.Texture2DCanvas and EGLView's bug
Refactor getter/setter to support compile.
Issue #4277: add a temple project to Cocos2d-Html5
Merge branch 'master' of git://github.com/cocos2d/cocos2d-html5 into Iss4277_FixBugsForV3.0
Merge pull request #1652 from dingpinglv/Iss4277_FixBugsForV3.0

Issue #4277: add a temple project to Cocos2d-Html5
issue #4277 : To support compile.
Refactor #4308: Move all singleton objects initialization into CCBoot
Merge branch 'develop-3.0' of git://github.com/cocos2d/cocos2d-html5 into MergeSingleton
Merge pull request #1653 from pandamicro/MergeSingleton

Refactor #4308: Move all singleton objects initialization into CCBoot
Merge.
Merge pull request #1654 from SmallAiTT/iss_4277_fix4release3.0

issue #4277 : To support compile.
issue #4277 Add publish scripts to help developers publish project with nodes.
Merge branch 'develop-3.0' of git://github.com/cocos2d/cocos2d-html5 into iss_4277_fix4release3.0
Merge pull request #1655 from SmallAiTT/iss_4277_fix4release3.0

issue #4277 Add publish scripts to help developers publish project with nodejs
issue #4277 : delete chinese comments.