updated docs
Merge branch 'master' of https://github.com/chukong/cocos-docs

Conflicts:
	catalog/framework/quick/zh.md
Merge pull request #514 from gloryming/master

updated docs