Merge branch 'develop'

Conflicts:
	README.rst
	mopidy_musicbox_webclient/static/css/webclient.css
	mopidy_musicbox_webclient/static/index.html