Merge pull request #47 from meteormatt/master

Add zh-CN l10n translate
Merge pull request #1 from jdm/master

合并