restored live tv playback in the web client
Merge remote-tracking branch 'upstream/master'