Merge pull request #7 from xy19xiaoyu/master

merge1113_2
1
Merge branch 'master' of https://github.com/satzcoal/GJD
i18n notice
Merge pull request #9 from satzcoal/lee_edit

Lee edit 1117