end of day
tidy
Merge branch 'tb' of https://github.com/tomhaigh/rockpool-jukebox

Conflicts:
	public/desktop.css
	public/stream.html
	server.js
	views/app.html
	views/streams.html
Merge branch 'master' of https://github.com/tomhaigh/rockpool-jukebox
minor tweaks to template
Voting
fix conflict
test
bodge authentication
add example config file
tidy auth controller
minor css tweaks
Merge branch 'master' of https://github.com/tomhaigh/rockpool-jukebox

Conflicts:
	server.js
	views/app.html
create combined data service and split sockets out into service
Unsubscribe from other groups when leave a stream
Only play items once
add titles back
bug fixes
fixes
make sorting in one place