Streamhoster: MightyUpload fixed
Merge branch 'master' of https://github.com/dhwz/MediaPortal
kinox.to fixes
simpleplayer fix
dokuhouse: genre fixes
YouPorn country fix
fi
simpleplayer: conf. m-info key
allmusichouse disabled
Merge branch 'upstream/master'

Conflicts:
	src/additions/grauzone/streamoase.py