Merge branch 'develop'
修改、中文化及自定義暱稱
Merge branch 'master' into develop