add how-to/use-project-mac-and-win
add how-to/upgrade-to_2_2_3
Update zh.md
move
Merge pull request #286 from linshun/master

Updated chapter 3 of parkour tutorials to v3.0
Update en.md
Update en.md
Docs #5250: add plugin-x document
Merge pull request #290 from linshun/master

Updated chapter 4 of parkour tutorials to cocos2d-js v3.0
Docs #5250 : add doc for plugin integration
修改catalog下的目录结构
#5250: add ndk_module_path
Merge pull request #293 from linshun/master

Update chapter 5 of parkour tutorials to cocos2d-js v3.0
Merge pull request #292 from rainswan/master

修改catalog下的目录结构
整理文档的存放方式
编辑总索引
Merge branch 'master' of https://github.com/rainswan/cocos-docs

Conflicts:
	catalog/zh.md
Merge pull request #295 from u0u0/master

Merge branch 'master' of https://github.com/rainswan/cocos-docs
Merge pull request #291 from joshuastray/master

Docs #5250: add plugin-x document
Merge pull request #289 from xiebaochun/patch-4

Update en.md