Added support for replacing a playlist on a DS; store UPNP metadata in m3u file as a comment; support tracks which don't exist on a local filesystem
Fixed merge conflict