Google Play Music does this, and any music missing from their catalogue can be uploaded and is seamlessly integrated with their streaming music (a big deal - sp

Google Play Music does this, and any music missing from their catalogue can be uploaded and is seamlessly integrated with their streaming music (a big deal - spotify just creates a folder of Local Files which don't even show up in searches). The only downsides are the web-only interface and the mobile app's excessive caching which seems to use at least double the data of Spotify.