minor
Merge branch 'master' of https://github.com/Hemmingsson/Jukbox

Conflicts:
	site/index.php