fixed typo
Merge pull request #1538 from asalga/master

fixed typo
issue #4221 add richText
issue #4221 Refactor flipped
issue #4221 Refactor setBackGroundImageColor for Layout
issue #4221 add getCustomSize method for widget
Issue #4277 : Make CCBoot to support singlefile mode.
Merge branch 'develop-3.0' of git://github.com/cocos2d/cocos2d-html5 into iss_4277_fix4release3.0
issue #4221 Set default enabled touch for widget
Merge pull request #1647 from SmallAiTT/iss_4277_fix4release3.0

Issue #4277 : Make CCBoot to support singlefile mode.
issue #4221 Fixed some bug
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into develop-3.0-new

Conflicts:
	extensions/ccui/base-classes/UIWidget.js
	extensions/ccui/layouts/UILayout.js
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