Changing rooms works on webserver
Merge branch 'master' of https://github.com/NomeAutomation/NomeAutomation

Conflicts:
	webserver/views/liveusage.ejs