Merge pull request #1 from chukong/master

update cocos
config.json descript
add variable type
modify data type
moidfy
moidfy
review part of article
Merge branch 'master' of https://github.com/renshan/cocos-docs

Conflicts:
	tutorial/framework/native/how-to-create-buttons-in-cocos2d-simple-radio-and-toggle/zh.md
	tutorial/framework/native/how-to-drag-and-drop-sprites/zh.md
	tutorial/framework/native/how-to-make-a-space-shooter-game/zh.md
	tutorial/framework/native/how-to-mask-a-sprite-with-cocos2dx/zh.md
	tutorial/framework/native/how-to-use-animations-and-spritesheets/zh.md
	tutorial/framework/native/how-to-use-texturepacker-to-optimize-the-spritesheet/zh.md
	tutorial/framework/native/sprite-tutorial/chapter2/zh.md
	tutorial/framework/native/sprite-tutorial/chapter3/zh.md
Merge remote-tracking branch 'chukong-cocos-docs/master'
Merge branch 'master' of https://github.com/chukong/cocos-docs
add readme
Quick教程第四篇
Merge pull request #431 from rainswan/master

Quick教程第四篇
Merge pull request #429 from chuanweizhang2013/master

IDE runtime config.json readme
updated links
Merge branch 'master' of https://github.com/chukong/cocos-docs
Merge pull request #432 from honghui/master

update code ide document to 1.0.0-rc1
Merge pull request #433 from gloryming/master

updated links
[Cocos2d-JS] Fix API ref link issue
Merge branch 'master' of https://github.com/cocos2d/cocos-docs