added room change and live updates for web
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	web/web.html