Merge branch 'refs/heads/develop' into tv

Conflicts:
	couchpotato/core/media/_base/media/main.py
	couchpotato/core/media/_base/searcher/main.py
	couchpotato/core/media/movie/_base/main.py
	couchpotato/core/media/movie/searcher/main.py

couchpotato/core/media/_base/media/main.py

@@ -4,6 +4,7 @@ from couchpotato.core.event import fireEvent, fireEventAsync, addEvent
 from couchpotato.core.helpers.variable import splitString
 from couchpotato.core.logger import CPLog
 from couchpotato.core.media import MediaBase
+from couchpotato.core.settings.model import Media
 
 log = CPLog(__name__)
 

couchpotato/core/plugins/release/main.py

@@ -9,8 +9,8 @@ from couchpotato.core.settings.model import File, Release as Relea, Media
 from sqlalchemy.orm import joinedload_all
 from sqlalchemy.sql.expression import and_, or_
 import os
-import traceback
 import time
+import traceback
 
 log = CPLog(__name__)
 

couchpotato/core/providers/torrent/torrentbytes/main.py

@@ -12,7 +12,7 @@ class TorrentBytes(TorrentProvider):
 
     urls = {
         'test' : 'https://www.torrentbytes.net/',
-        'login' : 'https://www.torrentbytes.net/login.php',
+        'login' : 'https://www.torrentbytes.net/takelogin.php',
         'login_check' : 'https://www.torrentbytes.net/inbox.php',
         'detail' : 'https://www.torrentbytes.net/details.php?id=%s',
         'search' : 'https://www.torrentbytes.net/browse.php?search=%s&cat=%d',