diandian界面修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	locales/ja.js
	routes/index.js
多过语言修改