merge
lobby
Merge branch 'master' of gitlab.com:serpteam/scienceroom

Conflicts:
	www/js/index.js
merge
Merge branch 'master' of gitlab.com:serpteam/scienceroom

Conflicts:
	www/js/index.js
Change logo