chat
Merge branch 'master' of https://github.com/Foboy/GoGoJP

Conflicts:
	www/partials/service/list.html
	www/scripts/rest-urls.js