Revert "Merge branches 'develop' and 'tv' of https://github.com/RuudBurger/CouchPotatoServer into tv"

This reverts commit b8bce948c8407184190a6333e73925946ede11a2, reversing
changes made to 0a996857ddfc806a19dd9572027b87e09ffb3b7d.