translate
translated.
translated.
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/guide-zh-CN/intro-yii.md
translated.
translating..
translated
Merge branch 'master' of https://github.com/yiisoft/yii2
Merge pull request #3867 from riverlet/zh-CN-translate-0604

Chinese guide