Merge pull request #13 from cocos2d/master

Updated with upstream.
Merge pull request #14 from cocos2d/master

Synchronizing to the latest cocos2d-js-test
Merge pull request #15 from cocos2d/master

Updated with upstream.
Merge pull request #16 from cocos2d/master

Updated with upstream.
Merge pull request #20 from cocos2d/master

Updated with upstream.
issue #2828 javascript binding debug.
issue #2828 cocostudio javascript binding debug
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 #3192 javascript compress
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
issue #3129 fixed bug of moonWarriors that it will error when click play button twice.
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