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 pull request #412 from u0u0/master

new html5 article.
add source code
Merge pull request #413 from gloryming/master

add source code
updated files
add xml-parse/zh.md
updated catalog
Merge pull request #414 from gloryming/master

updated files
Spelling mistakes
Update zh.md
Merge pull request #415 from VisualSJ/master

Spelling mistakes
Merge pull request #416 from jonahzheng/patch-1

Update zh.md
Update zh.md