First implementation for Pyload OCH integration...
Merge branch 'master' of https://github.com/seppi91/CouchPotatoServer
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'