dde:已校对的pot 和 zh_CN.po
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	resources/guide/js/main.coffee