fixes #838 - Support rtmp protocol with channels
#762 - Marking unwatched doesn't update display
#762 - Marking unwatched doesn't update display
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser