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

Conflicts:
	www/.idea/workspace.xml