Add class="active" to room links
Merge origin/master

Conflicts:
	app.js
	src/expo/expo.js