f
op
Merge branch 'master' of https://github.com/mschmidbartl/jukebox.git

Conflicts:
	www/public/js/uiController.js