初步校验，未完成，回去继续
ok, that's all!
Merge remote-tracking branch 'zmm/master'

Conflicts:
	translations/zh.yaml
add new stuff
Merge pull request #3 from sunnylost/sunnylost

@sunnylost 校对修改