[Cocos2d-JS PG] Sync Chinese programming guide
Merge branch 'master' of https://github.com/cocos2d/cocos-docs

Conflicts:
	catalog/framework/cocos2d-js/zh.md
Merge pull request #580 from pandamicro/master

[Cocos2d-JS PG] Sync Chinese programming guide