Issue #3192: fix some bugs for releasing v2.2.1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss3192_FixBugsForReleaseV2.2.1
Merge pull request #1232 from dingpinglv/Iss3192_FixBugsForReleaseV2.2.1

Issue #3192: fix some bugs for releasing v2.2.1