Merge pull request #1 from cocos2d/master

g
q
setting up development environments on mac with eclipse for v3.0
setting up development environments on mac with Xcode for v3.0
update "setup win32 development environment"
Merge pull request #189 from andyque/master

fix lots typo
Merge pull request #190 from u0u0/master

setting up development environments for v3.0
update chinese catalog
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