bug fix
Merge branch 'master' of https://github.com/r2space/YUKARiWeb

Conflicts:
	core/utils.js