update
Merge branch 'master' of https://github.com/mmelkko/Web-jukebox

Conflicts:
	web-jukebox/app/assets/javascripts/rooms.js