Merge branch 'master' of https://github.com/rainswan/cocos-docs

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

merge
Merge commit '43463ee33da395425958b3170b1884545fdaedf3'

* commit '43463ee33da395425958b3170b1884545fdaedf3':
修复链接指向错误