setting.json初步作成
Merge branch 'master' of https://github.com/r2space/YUKARiWeb

Conflicts:
	modules/mod_synthetic.js