Merge pull request #1 from cocos2d/master

g
q
Merge pull request #191 from u0u0/master

update chinese catalog
Update zh.md
Update zh.md
rename setup development-environment articles.
Merge pull request #192 from Ivenyang/master

rename setup development-environment articles.
add two articles
Merge pull request #193 from Ivenyang/master

add two articles
H5: v3.0a release-note added
H5: doc for cocos-console added
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
fix links.
Merge branch 'master' of https://github.com/cocos2d/cocos-docs

Conflicts:
	manual/framework/native/graphic/coordinate-system/zh.md
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge pull request #195 from Ivenyang/master

fix links.
Modify two article about setting up development environments
add about us.
Merge pull request #196 from Ivenyang/master

add about us.
Merge pull request #194 from pandamicro/master

H5: v3.0a release-note and doc for cocos-console added