Use url from config file
Merge branch 'master' into client-tests

Conflicts:
	public/app/scripts/playlist.js