quick-cocos2d-x文件结构分析
Merge pull request #356 from renshan/master

add flappybird.zip
add English document for reflection
add cc.reflection
Correct Cocos2d-x naming
Merge pull request #358 from Yangtb/master

Correct Cocos2d-x naming
Correct Cocos2d-x naming
Merge pull request #359 from Yangtb/master

Correct Cocos2d-x naming
Correct Cocos2d-x naming under folder manual
Merge pull request #360 from Yangtb/master

Correct Cocos2d-x naming under folder manual
update keywords cases
Merge pull request #362 from gloryming/master

update keywords cases
Revert "quick-cocos2d-x文件结构分析"

This reverts commit bcf2f95e2943a49cbfd7fc709b6389f3b107118b.
Merge branch 'master' of https://github.com/chukong/cocos-docs

# By gloryming (6) and others
# Via Ivenyang (18) and others
* 'master' of https://github.com/chukong/cocos-docs: (38 commits)
  update keywords cases
  Correct Cocos2d-x naming under folder manual
  Correct Cocos2d-x naming
  Correct Cocos2d-x naming
  add flappybird.zip
  updated docs
  review flappybird article
  update docs
  add reflection document
  update quick-cocos2d-lua
  Added the document of cc.Layer's bake function
  fix bug
  fixed bugs
  [Cocos2d-JS] Improve introduction doc
  update catalog/studio/zh.md
  Broken down install document into two systems
  add wiki translations
  Replace one image for mac version logo.
  add Cocostudio install manual
  update docs
  ...
quick文件系统分析
Merge pull request #357 from joshuastray/master

add English document for reflection
Merge pull request #363 from rainswan/master

quick文件系统结构分析
改变大小写
Update zh.md
Update zh.md