fixed body padding css
Merge pull request #193 from nickescallon/dev

Sidebar now updates based on votes
css for displaying number of votes
Merge branch 'cssChanges' into dev
Merge pull request #194 from malucky/dev

css display for number of votes
fixed whitespace
Change path to listenId when the Queue in side bar is clicked
Merge branch 'dbfix' into dev

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

Correctly loading playlist into queue
Changed the share url to /q/:shareId when clicked
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
fix clone functionality. TODO: change the url in saveQueue in queue service for ammo.io
Merge branch 'queueUrlFix' into dev
Minor bug fix
Merge pull request #198 from malucky/dev

fix clone, queue routing, and add /q/:shareId
commented out share playlist button and refreshing playlist when removing song
Fixed server bug causing a server crash when sharing a queue that was created by playing a playlist
Merge pull request #201 from deini/dev

Fixed server bug causing a server crash when sharing a queue that was cr...