Update zh.md
add Parkour package
Merge pull request #528 from Yangtb/master

add Parkour package
Merge pull request #527 from pandamicro/master

[Cocos2d-JS PG] 4.4 Resolution Policy en and improvement
Merge branch 'patch-8' of https://github.com/purpleenjae/cocos-docs

Conflicts:
	catalog/framework/quick/zh.md
Merge pull request #529 from u0u0/master

manual merge
Improved grammar and sentence structure.
Fixed spelling of 'documentation'.
Corrected grammatical and syntactical errors

I would love to make this documentation better. Would you add me to this project?
Merge pull request #530 from simondel/master

Improved grammar and sentence structure in the JS tutorial (part 1).
Merge pull request #531 from simondel/readme-fix

Fixed spelling of 'documentation'.
add cocos2d-js chapter 3
Merge pull request #533 from u0u0/master

add cocos2d-js chapter 3
Merge pull request #532 from SuhairZain/patch-1

Corrected grammatical and syntactical errors
[Cocos2d-JS] Improve Facebook integration on iOS