Merge branch 'refs/heads/develop'

Conflicts:
	version.py

couchpotato/core/downloaders/base.py

@@ -57,6 +57,9 @@ class Downloader(Provider):
 
         return self.getAllDownloadStatus()
 
+    def getAllDownloadStatus(self):
+        return
+
     def _removeFailed(self, item):
         if self.isDisabled(manual = True, data = {}):
             return

couchpotato/core/plugins/manage/main.py

@@ -198,7 +198,7 @@ class Manage(Plugin):
 
     def directories(self):
         try:
-            if self.conf('library', '').strip():
+            if self.conf('library', default = '').strip():
                 return splitString(self.conf('library', default = ''), '::')
         except:
             pass

couchpotato/runner.py

@@ -259,7 +259,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
 
     while try_restart:
         try:
-            server.listen(config['port'])
+            server.listen(config['port'], config['host'])
             loop.start()
         except Exception, e:
             try:

version.py

@@ -1,2 +1,2 @@
-VERSION = '2.0.1.1'
+VERSION = '2.0.6'
 BRANCH = 'master'