Merge pull request #162 from nickescallon/dev

images now load in playlist view
Added socket.io dependency in package.json
Added bower socket io dependency and test talking to client on connection
In the middle of change
In middle of change
Implemented socket.io functionality for updating song when a valid client adds a new song
Merge pull request #164 from malucky/dev

Update view when another client with same share id adds a song using socket io
Refactores next songs sidebar implementation
Merge branch 'nextSongs' into dev

Conflicts:
	public/scripts/app.js
Fixed socket.io dependency
Merge pull request #165 from deini/dev

Now showing next 5 songs
Added functionality to add song to queue or playlist
Merge pull request #168 from deini/dev

Added functionality to add song to queue or playlist
Deleted rdio helper script that is duplicate
change twitter share via to ammo_io
Added remove song from playlist and small bugfixes
Merge pull request #170 from deini/dev

Added remove song from playlist and small bugfixes
Hiding player control panel when in share view
Deleted rdio helper script that is duplicate
change twitter share via to ammo_io