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 #245 from u0u0/master

action for v3.0
[Cocos2d-JS] Improve 3.0 release note
[Cocos2d-JS] Improve cc.sys doc
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge pull request #246 from pandamicro/master

[Cocos2d-JS] Improve 3.0 release note and cc.sys doc
Add a doc about lua binding for custom class
Merge branch 'master' of https://github.com/cocos2d/cocos-docs into luaDocument
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