fixed typo
Merge pull request #1538 from asalga/master

fixed typo
Merge pull request #1649 from dingpinglv/Iss4277_FixBugsForV3.0

Issue #4277: fixed cc.eventManager, cc.Texture2DCanvas and EGLView's bug
Issue #4277: add a temple project to Cocos2d-Html5
Merge branch 'master' of git://github.com/cocos2d/cocos2d-html5 into Iss4277_FixBugsForV3.0