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
[Cocos2d-JS] Move usb docs into jsb folder
[Cocos2d-JS] Add iOS IAP doc
[Cocos2d-JS] Add objects pool doc
[Cocos2d-JS] Add js to oc reflection doc
[Cocos2d-JS] Update catalog
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
[Cocos2d-JS] Update create and new construction related informations
Merge pull request #428 from pandamicro/master

[Cocos2d-JS] Add js docs
Merge pull request #427 from Yangtb/master

add fast-tileMap
[Cocos2d-JS] Add release note for 3.0 RC2
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge branch 'master' of https://github.com/chukong/cocos-docs