UI update
Merge branch 'NewBiz' of https://github.com/tomhaigh/rockpool-jukebox into NewBiz

Conflicts:
	public/js/app.js
	views/app.html