corrected apk name
fix bug
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge pull request #1 from chukong/master

merge from chukong
add some explain about FIXED_HEIGHT and FIXED_WIDTH
scaled->resized
add doc for inheritance in cocos2d-js 3.0
\->/ in url
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge pull request #247 from samuele3hu/luaDocument

Add a doc about lua binding for custom class
release note for v3.0
Merge pull request #248 from minggo/release-note-v3

release note for v3.0
Merge pull request #2 from chukong/master

merge from chukong
update Cocos Code IDE to beta
Merge pull request #238 from joshuastray/master

add some explain about FIXED_HEIGHT and FIXED_WIDTH
add Cocos Code IDE's release note
show Cocos Code IDE manual to catalog
Merge pull request #249 from honghui/master

update Cocos Code IDE to beta and add release note
make names to standard
Merge pull request #250 from honghui/master

make names to standard