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

Conflicts:
	docs/guide-zh-CN/intro-yii.md