modify filename
Merge pull request #327 from rainswan/master

修复链接指向错误
Update zh.md
update link
modify PlayScnee.js to PlayScene.js
Merge pull request #330 from ccf19881030/patch-1

modify "PlayScnee.js"  to "PlayScene.js"
update auto-batching.
Merge pull request #331 from u0u0/master

update auto-batching.
Update en.md

Changed "appFiles" to "jsList" in the project.json description
Update en.md

Fixes a typo "PlayScnee.js" to "PlayScene.js"
Update en.md
Updates en.md

Fixes "jumps up and jumps up" to "jumps up or jumps down"
add winSize variable define.

When I used the IDE "JetBrains WebStorm 8.0.3" to debug the tutorial's code above, I found in the BackgroundLayer.js and StatusLayer.js file, the variable winSize is undefined,so I should first define it through adding extra code "var winSize = cc.Director.getInstance().getWinSize();", the project code provided at last link "https://github.com/chukong/cocos-docs/blob/master/tutorial/framework/html5/parkour-game-with-javascript/chapter4/res/Parkour.zip" is ok while the tutorial's code is not correct!
Merge pull request #333 from ccf19881030/patch-2

fix code error: add variable winSize's define.
[Cocos2d-JS] Improve Upgrade Guide for 3.0 beta
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge pull request #334 from pandamicro/master

[Cocos2d-JS] Improve Upgrade Guide for 3.0 beta
tutorial about how to use resource manager.
Merge pull request #335 from Ivenyang/master

tutorial about how to use resource manager.
Fix a typo in director-scene-layer-and-spirte.