Playlists and set yo username
Merge branch 'master' of github.com:StarTrack/server

Conflicts:
	public/javascripts/components/Cockpit.js