add quick catalog
modify link type
Merge branch 'master' of github.com:chukong/cocos-docs

Conflicts:
	catalog/framework/quick/zh.md
update engine version
Revert "update engine version"

This reverts commit e2db75a86907a44f2fbce01297af8c1c680cd89e.
Merge branch 'master' of https://github.com/chukong/cocos-docs
[Cocos2d-JS] Fix link issues in Facebook docs
Update en.md

Remove some irrelevant code from the samples.

It's not present in the end PlayScene.js anyway,
and it doesn't make sense in the current scenario.
[Cocos2d-JS] Update getter setter list
no message
modify some change api
modify some change api
Create ko.md ( wiki / about-us )
Create ko.md ( wiki / actions )
Merge pull request #457 from rtNavy/master

Create ko.md ( wiki / about-us )
Merge pull request #456 from VisualSJ/master

merge payment document and logEvent document
Merge pull request #449 from timotei/patch-2

Update en.md
Update zh.md
Create ko.md ( wiki / detailed explanation of multi resolution )
[Cocos2d-JS] Update getter-setter list