Merge pull request #1 from chukong/master

update cocos
config.json descript
add variable type
modify data type
moidfy
moidfy
提交quick的文章
Merge pull request #342 from dualface/master

update docs
add Cocostudio install manual
Replace one image for mac version logo.
add wiki translations
Merge pull request #343 from u0u0/master

add wiki translations
Merge pull request #344 from hanrea/master

Add cocostudio install document
Broken down install document into two systems
Merge pull request #345 from hanrea/master

Broken down install document into two systems
update catalog/studio/zh.md
[Cocos2d-JS] Improve introduction doc
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge pull request #347 from pandamicro/master

[Cocos2d-JS] Improve introduction doc
Merge pull request #346 from hanrea/master

update catalog/studio/zh.md