fixed body padding css
Merge pull request #194 from malucky/dev

css display for number of votes
fixed whitespace
Merge branch 'dbfix' into dev

Conflicts:
	public/scripts/services/queue.js
Merge pull request #195 from alexmckenley/dev

Correctly loading playlist into queue
Search results now handles when one of the search services fail
Merge branch 'promise' into dev
Merge pull request #196 from deini/dev

Search results now handles when one of the search services fail