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

Conflicts:
	www/scripts/app.js