Merge branch 'downloaders_test' of git://github.com/mikke89/CouchPotatoServer into mikke89-downloaders_test

Conflicts:
	couchpotato/core/downloaders/rtorrent/main.py

couchpotato/core/_base/clientscript/main.py

@@ -49,6 +49,7 @@ class ClientScript(Plugin):
             'scripts/page/settings.js',
             'scripts/page/about.js',
             'scripts/page/manage.js',
+            'scripts/misc/downloaders.js',
         ],
     }