fixed bug, that caused content to be served at low bitrate, maximum quality was chosen and source-quality has same resolution as high-quality
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	twitch.py