多国语对应
Merge branch 'master' of https://github.com/r2space/YUKARiWeb

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