Merge branches 'develop' and 'tv' of https://github.com/RuudBurger/CouchPotatoServer into tv

Conflicts:
	couchpotato/core/plugins/renamer/main.py

couchpotato/core/helpers/encoding.py

@@ -54,6 +54,10 @@ def sp(path, *args):
     if not path or len(path) == 0:
         return path
 
+    # convert windows path (from remote box) to *nix path
+    if os.path.sep == '/' and '\\' in path:
+        path = '/' + path.replace(':', '').replace('\\', '/')
+
     path = os.path.normcase(os.path.normpath(ss(path, *args)))
 
     if path != os.path.sep: