多过语言修改
Merge branch 'master' of https://github.com/r2space/DiandianWeb

Conflicts:
	locales/ja.js
Merge branch 'master' of https://github.com/r2space/DiandianWeb

Conflicts:
	locales/ja.js
Merge branch 'master' of https://github.com/r2space/DiandianWeb

Conflicts:
	locales/ja.js
	routes/index.js
Merge HEAD, branch 'master' of https://github.com/r2space/DiandianWeb

Conflicts:
	locales/ja.js
菜品列表  增加
Merge HEAD, branch 'master' of https://github.com/r2space/DiandianWeb
菜品列表  增加
Merge HEAD, branch 'master' of https://github.com/r2space/DiandianWeb

Conflicts:
	routes/index.js
Merge HEAD, branch 'master' of https://github.com/r2space/DiandianWeb

Conflicts:
	routes/index.js
Merge branch 'master' of https://github.com/r2space/DiandianWeb

Conflicts:
	routes/index.js
Merge HEAD, branch 'master' of https://github.com/r2space/DiandianWeb

Conflicts:
	routes/index.js
Merge branch 'master' of https://github.com/r2space/DiandianWeb

Conflicts:
	locales/zh.js
	routes/index.js
菜品的增删改查
Merge branch 'master' of https://github.com/r2space/DiandianWeb
菜品的增删改查