fixed #3514, add source code for chapter 3 of Parkour game.
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge pull request #52 from u0u0/master

fixed #3514, add source code for chapter 3 of Parkour game.
Merge pull request #53 from andyque/master

merge template container of zaxin
issue #3299, add en.md
issue #3229, review
Add sample code for parkour game with js chapter 4.
issue #3229, review
issue #3229, review
Merge branch 'master' of github.com:gloryming/cocos-docs
fixed #3229, review
Merge pull request #56 from gloryming/master

fixed #3229, review