Fixes
Merge branch 'php' of https://github.com/legomaniack/music_spotlight into php

Conflicts:
	index.php