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

Conflicts:
	catalog/framework/quick/zh.md
[Cocos2d-JS] RC3 release note
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Update zh.md
[Cocos2d-JS] Docs for v3.0 RC3 release
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
[Cocos2d-JS] Improve doc for v3.0 RC3 release
[Cocos2d-JS] Improve doc for v3.0 RC3 release
Merge pull request #476 from pandamicro/master

[Cocos2d-JS] Docs for v3.0 RC3 release
Merge pull request #477 from joshuastray/master

update facebook android doc to 3.0rc3
[Cocos2d-JS] Upgrade Facebook SDK Docs to Beta
Merge pull request #478 from pandamicro/master

[Cocos2d-JS] Upgrade Facebook SDK Docs to Beta
Merge pull request #474 from purpleenjae/patch-5

Update zh.md
updated
Merge branch 'master' of https://github.com/chukong/cocos-docs
updated  3.0rc3
[Cocos2d-JS] Improve doc for v3.0 RC3 release
Merge branch 'master' of https://github.com/cocos2d/cocos-docs