Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
delete html tags.
change folder name.
Merge pull request #96 from andyque/master

issue #3503. fix some grammar errors of the new renderer
Merge pull request #97 from andyque/master

issue #3503. review the chapter1 article of parkour-game-with-javascript
Merge pull request #98 from andyque/master

issue #3503. delete original folder and move the article
Merge pull request #99 from Ivenyang/master

change folder name.
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Minor spelling, grammar fixes.
issue #3675, add document of websocket.
Merge pull request #100 from bunnyhero/vector-typo-fixes

Minor spelling, grammar fixes.
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Added "What is CocoStudio" in Japanese.
issue #3675, add Lua API usage.
fixed #3675, add JSB API usage.
Merge pull request #102 from tks2shimizu/master

Added "What is CocoStudio"
Merge pull request #101 from u0u0/master

fixed #3675, add document of websocket.