Merge pull request #239 from xingsenma/master

issue #2828 update cocostudio test
Issue #3221: update the version number
Merge pull request #241 from dingpinglv/Iss3221_ReleaseV2.2.1

Issue #3221: update the version number
use cc.VisibleRect instead of VisibleRect
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
Merge pull request #244 from dingpinglv/Iss3221_ReleaseV2.2.1

Issue #3221: modify simulator.html to adapt engine's EGLView
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
Merge pull request #245 from dingpinglv/Iss3221_ReleaseV2.2.1

Issue #3221: modify simulator.html to adapt engine's EGLView
Merge pull request #242 from ShengxiangChen/visbleRect

use cc.VisibleRect instead of VisibleRect
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js-tests into Cocostudio

Conflicts:
	tests/CocoStudioTest/ArmatureTest/ArmatureTest.js