corrected apk name
fix bug
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
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 #238 from joshuastray/master

add some explain about FIXED_HEIGHT and FIXED_WIDTH
Merge pull request #249 from honghui/master

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

make names to standard
[Cocos2d-JS] Prepare docs for alpha2 release
[Cocos2d-JS] Update catalog
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge pull request #251 from pandamicro/master

[Cocos2d-JS] Prepare docs for alpha2 release
[Cocos2d-JS] Improve release notes
add integration-iOS-push doc
Merge pull request #253 from Yangtb/master

add integration-iOS-push doc
修改图片
Merge pull request #254 from renshan/patch-3

modify image