Merge pull request #1 from cocos2d/master

g
q
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
Modify two article about setting up development environments
Merge pull request #197 from renshan/master

Modify two article about setting up development environments