Merge branch 'develop-categories' of git://github.com/clinton-hall/CouchPotatoServer into clinton-hall-develop-categories

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

couchpotato/core/plugins/renamer/main.py

@@ -148,6 +148,10 @@ class Renamer(Plugin):
             remove_releases = []
 
             movie_title = getTitle(group['library'])
+            try:
+                destination = group['category']['path']
+            except:
+                destination = self.conf('to')
 
             # Add _UNKNOWN_ if no library item is connected
             if not group['library'] or not movie_title:
@@ -817,4 +821,4 @@ Remove it if you want it to be renamed (again, or at least let it try again)
         return item['id'] and item['downloader'] and item['folder']
     
     def movieInFromFolder(self, movie_folder):
-        return movie_folder and self.conf('from') in movie_folder or not movie_folder
+        return movie_folder and self.conf('from') in movie_folder or not movie_folder