daemonc/remotecontrol.cpp: fix Merge 97875b48556ad468be77cf5c927d9b22ca779a70
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
src/gui/movieplayer.cpp: fix generic compile
Merge branch 'master' of https://github.com/MaxWiesel/neutrino-mp-cst-next

Conflicts:
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp