Merge branch 'refs/heads/develop' into desktop

Conflicts:
	version.py

couchpotato/core/plugins/browser/main.py

@@ -55,7 +55,7 @@ class FileBrowser(Plugin):
 
         driveletters = []
         for drive in string.ascii_uppercase:
-            if win32file.GetDriveType(drive + ":") in [win32file.DRIVE_FIXED, win32file.DRIVE_REMOTE]:
+            if win32file.GetDriveType(drive + ":") in [win32file.DRIVE_FIXED, win32file.DRIVE_REMOTE, win32file.DRIVE_RAMDISK, win32file.DRIVE_REMOVABLE]:
                 driveletters.append(drive + ":\\")
 
         return driveletters

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

@@ -24,7 +24,7 @@ class PublicHD(TorrentProvider):
 
         results = []
 
-        if self.isDisabled() or quality['hd'] != True:
+        if self.isDisabled() or not quality.get('hd', False):
             return results
 
         params = tryUrlencode({

version.py

@@ -1,2 +1,2 @@
-VERSION = '2.0.0.pre1'
+VERSION = '2.0.0.pre2'
 BRANCH = 'desktop'