Merge pull request #241 from dingpinglv/Iss3221_ReleaseV2.2.1

Issue #3221: update the version number
Issue #3221: modify simulator.html to adapt engine's EGLView
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Iss3221_ReleaseV2.2.1