Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge branches 'master' and 'master' of https://github.com/cocos2d/cocos-docs
corrected apk name
add menu for cocos2d-x 3.0
Merge pull request #229 from u0u0/master

add menu for cocos2d-x 3.0
"how to make a sushicrash game by cocos2dx" part 2
Merge branch 'master' of https://github.com/chukong/cocos-docs
Merge pull request #230 from u0u0/master

 "how to make a sushicrash game by cocos2dx" part 2
fix wrong words
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge pull request #231 from gloryming/master

fix wrong words
fix bug
[Cocos2d-JS]v3.0a2 and v2.2.3 change log added
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
add scheduler for v3.0
Merge pull request #233 from u0u0/master

add scheduler for v3.0
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
add doc for how to add extension to jsb
fix indent
add xcode