updated catalog and tutorials list
Merge pull request #365 from gloryming/master

updated catalog and tutorials list
Update zh.md
Update en.md
2048 game tutorial.
Merge pull request #367 from u0u0/master

2048 game tutorial.
update docs
Merge branch 'master' of https://github.com/joshuastray/cocos-docs

Conflicts:
	manual/framework/html5/v3/reflection/zh.md
Merge pull request #369 from u0u0/master

merge
Merge branch 'master' of https://github.com/chukong/cocos-docs
Update zh.md
Merge pull request #368 from gloryming/master

update docs
fixed upper case of quick-cocos
finish wiki translate.
Merge pull request #371 from u0u0/master

finish wiki translate.
Merge pull request #370 from gloryming/master

fixed upper case of quick-cocos
add C++ style
add C++ style
update list
Merge pull request #372 from gloryming/master

add C++ style