gui/scan_setup.cpp: fix separator between sat and cable scan option
gui/movieplayer.cpp: re-enable and fix auto-time display for REW, FF-modes
Merge remote-tracking branch 'cool-next-cc/next-cc'

Conflicts:
	src/gui/scan_setup.cpp