update some new functions.
fixed demo source error
fix catalog links
Merge branch 'master' of https://github.com/chukong/cocos-docs
Merge pull request #277 from u0u0/master

fix catalog links
Merge pull request #278 from linshun/master

Update the Parkour tutorials to V3.0
Merge pull request #279 from linshun/master

Removed useless link and fixed some expression.
add quick folder.
Merge pull request #280 from Ivenyang/master

add quick folder.
Merge pull request #275 from honghui/master

fixed demo source error
Merge pull request #273 from hanrea/master

update some new functions.
Merge pull request #281 from linshun/master

Updated chapter 2 of parkour tutorials to v3.0
Merge pull request #282 from linshun/master

fixed typo
Merge branch 'master' of https://github.com/cocos2d/cocos-docs

Conflicts:
	catalog/en.md
	catalog/zh.md
Updated catalog