Cleanup import
Merge branch 'develop' of github.com:RuudBurger/CouchPotatoServer into develop