Fixed typo of the resource g_groundHeight
Merge pull request #576 from simondel/parkour-js

Fixed typo of the resource g_groundHeight
Merge pull request #575 from pandamicro/master

[Cocos2d-JS] Polish Facebook docs
update
update format
update category
add catelog
Merge pull request #577 from hdecember/master

update Studio manual
修改第四部分地址
[Cocos2d-JS PG] Sync Chinese programming guide
Merge branch 'master' of https://github.com/cocos2d/cocos-docs

Conflicts:
	catalog/framework/cocos2d-js/zh.md