more front end
Merge branch 'master' of https://github.com/smashingboxes/smashing_jukebox
Merge branch 'master' of https://github.com/smashingboxes/smashing_jukebox

Conflicts:
	public/scripts/search.js
Merge branch 'master' of https://github.com/smashingboxes/smashing_jukebox