[Cocos2d-JS] Correct an issue
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Added index to parkour tutorials.
Merge pull request #297 from linshun/master

Added index to parkour tutorials.
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Removed camera which was deprecated by cocos2d-x
Removed camera API
removed camera of chapter 7
updated chapter 7
updated the code of chapter 8
updated the code and layer setting
updated chapter 9 and removed camera API
Merge pull request #298 from linshun/master

Removed camera which was deprecated by cocos2d-x
added new actions document
updated catalog
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
Merge pull request #300 from pandamicro/master

[Cocos2d-JS] Add AssetsManager documentation