Merge pull request #1 from andyque/master

更新zh catalog
issue #3450. move the resource files
issue #3450. fix the commit error
issue #3451. add one article
Merge pull request #25 from andyque/feature#3451

issue #3451. add one article
Merge remote-tracking branch 'upstream/master'
issue#3451. add a article
issue#3451.add one article and chang the path
issue#3451. add one article about html5
Merge pull request #3 from cuit-zhaxin/feature#3451

Feature#3451
issue #3450. add a res directory prefix
issue#3451. two article about studio
fixed #3450. Finish the res directory
Merge pull request #4 from cuit-zhaxin/feature#3451

issue#3451. two article about studio
Merge pull request #26 from andyque/master

add new zh articles
issue #3450. merge & resolve conflicts
Merge pull request #27 from andyque/master

add res directory to each article