sync
Merge branch 'master' of https://github.com/patrickrb/chausages

Conflicts:
	app/views/partials/queue.html
Merge branch 'master' of https://github.com/patrickrb/chausages

Conflicts:
	app/scripts/mocks/tracks.js