RuudBurger/CouchPotatoServer — pull request #3824 by fuzeman (2014-08-20 03:40:40+00:00)
Title: Merge base/movie changes from the "tv" branch

Cherry-picked all the changes from "tv" which can be included in the "develop" branch.