Merge pull request #36 from malucky/dev

Refactored searchResults into SearchService. Added dependencies for Sear...
Basic player logic
Merge from player
Changed player.play to the new play() function
Merge pull request #37 from deini/dev

Fixed Issue #21
Merge branch 'dev' into addToQueue

Conflicts:
	public/views/search.html