gui/mediaplayer_setup.cpp: integrate MB / YT settings, (c) martii
Merge remote-tracking branch 'cool-cst-next/cst-next'

Conflicts:
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
Merge remote-tracking branch 'MaxWiesel/master'