[Cocos2d-JS] Correct an issue
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge pull request #3 from chukong/master

merge from chukong
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge pull request #299 from linshun/master

added new actions document of cocos2d-js v3.0
[Cocos2d-JS] Add AssetsManager documentation
Merge branch 'master' of https://github.com/cocos2d/cocos-docs

Conflicts:
	catalog/zh.md
[Cocos2d-JS] Remove script language specification
update lua binding manual for cocos2d-x 3.1 upgrading and Cocos Code IDE auto-complete
Merge pull request #300 from pandamicro/master

[Cocos2d-JS] Add AssetsManager documentation
Merge pull request #301 from honghui/master

update lua binding manual for cocos2d-x 3.1 upgrading and Cocos Code IDE auto-complete
Update en.md

correct some code format
add copy_resources for plugin-x
add plugin-x in catalog
fix indent
Merge pull request #302 from lyfshadyboss/patch-1

Update docs/tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter3/en.md
Merge pull request #303 from joshuastray/master

add copy_resources for plugin-x
place en with zh in plugin-x document
Merge pull request #305 from joshuastray/master

replace en with zh in plugin-x document
Add cocos2d-js v3.0 beta changelog.