Merge branch 'master' of github.com:Ulrar/Mopidy-Subsonic

Conflicts:
	mopidy_subsonic/__init__.py
	mopidy_subsonic/library.py