playlist:add width song display
Merge branch 'master' of github.com:hugomassing/soundgether

Conflicts:
	client/app/playlist/playlist.controller.js
	client/app/playlist/playlist.html
playlist:fix merge conflicts