Review: resolve uri
Merge branch 'develop' of git://github.com/mopidy/mopidy.git into soundcloud_backend
Merge branch 'develop' of git://github.com/mopidy/mopidy.git into beets_backend
Fix: Double class, super methods
Merge branch 'beets_backend' into develop
Merge branch 'soundcloud_backend' into develop
Merge branch 'soundcloud/resolve_uri' into develop

Conflicts:
	mopidy/backends/soundcloud/playlists.py
Merge branch 'soundcloud/resolve_uri' into soundcloud_backend

Conflicts:
	mopidy/backends/soundcloud/playlists.py
Merge branch 'soundcloud_backend' into develop