update
update Merge branch 'master' of github.com:wondger/together

Conflicts:
	web/codes/together/chat/map-chat.js