Merge branch 'refs/heads/develop' into tv

Conflicts:
	couchpotato/core/media/movie/_base/main.py
	couchpotato/core/media/movie/library/movie/main.py
	couchpotato/core/plugins/dashboard/main.py
	couchpotato/core/plugins/profile/main.py
	couchpotato/core/plugins/release/main.py
	couchpotato/core/plugins/suggestion/main.py

couchpotato/static/scripts/couchpotato.js

@@ -15,7 +15,7 @@
 		var self = this;
 		self.setOptions(options);
 
-		self.c = $(document.body)
+		self.c = $(document.body);
 
 		self.route = new Route(self.defaults);
 
@@ -48,7 +48,6 @@
 	},
 
 	pushState: function(e){
-		var self = this;
 		if((!e.meta && Browser.Platform.mac) || (!e.control && !Browser.Platform.mac)){
 			(e).preventDefault();
 			var url = e.target.get('href');
@@ -112,11 +111,11 @@
 					'click': self.shutdownQA.bind(self)
 				}
 			})
-		]
+		];
 		
 		setting_links.each(function(a){
 			self.block.more.addLink(a)
-		})
+		});
 
 
 		new ScrollSpy({
@@ -134,7 +133,7 @@
 		var self = this;
 
 		Object.each(Page, function(page_class, class_name){
-			pg = new Page[class_name](self, {});
+			var pg = new Page[class_name](self, {});
 			self.pages[class_name] = pg;
 
 			$(pg).inject(self.content);
@@ -157,7 +156,7 @@
 			return;
 
 		if(self.current_page)
-			self.current_page.hide()
+			self.current_page.hide();
 
 		try {
 			var page = self.pages[page_name] || self.pages.Home;
@@ -191,7 +190,7 @@
 		self.checkAvailable(1000);
 	},
 
-	shutdownQA: function(e){
+	shutdownQA: function(){
 		var self = this;
 
 		var q = new Question('Are you sure you want to shutdown CouchPotato?', '', [{
@@ -240,7 +239,7 @@
 	checkForUpdate: function(onComplete){
 		var self = this;
 
-		Updater.check(onComplete)
+		Updater.check(onComplete);
 
 		self.blockPage('Please wait. If this takes too long, something must have gone wrong.', 'Checking for updates');
 		self.checkAvailable(3000);
@@ -258,7 +257,7 @@
 				},
 				'onSuccess': function(){
 					if(onAvailable)
-						onAvailable()
+						onAvailable();
 					self.unBlockPage();
 					self.fireEvent('reload');
 				}
@@ -272,7 +271,6 @@
 
 		self.unBlockPage();
 
-		var body = $(document.body);
 		self.mask = new Element('div.mask').adopt(
 			new Element('div').adopt(
 				new Element('h1', {'text': title || 'Unavailable'}),
@@ -329,7 +327,7 @@
 					'target': '',
 					'events': {
 						'click': function(e){
-							(e).stop()
+							(e).stop();
 							alert('Drag it to your bookmark ;)')
 						}
 					}
@@ -352,35 +350,35 @@ var Route = new Class({
 	params: {},
 
 	initialize: function(defaults){
-		var self = this
+		var self = this;
 		self.defaults = defaults
 	},
 
 	parse: function(){
 		var self = this;
 
-		var rep = function(pa){
+		var rep = function (pa) {
 			return pa.replace(Api.getOption('url'), '/').replace(App.getOption('base_url'), '/')
-		}
+		};
 
-		var path = rep(History.getPath())
+		var path = rep(History.getPath());
 		if(path == '/' && location.hash){
 			path = rep(location.hash.replace('#', '/'))
 		}
-		self.current = path.replace(/^\/+|\/+$/g, '')
-		var url = self.current.split('/')
+		self.current = path.replace(/^\/+|\/+$/g, '');
+		var url = self.current.split('/');
 
-		self.page = (url.length > 0) ? url.shift() : self.defaults.page
-		self.action = (url.length > 0) ? url.shift() : self.defaults.action
+		self.page = (url.length > 0) ? url.shift() : self.defaults.page;
+		self.action = (url.length > 0) ? url.shift() : self.defaults.action;
 
 		self.params = Object.merge({}, self.defaults.params);
 		if(url.length > 1){
-			var key
+			var key;
 			url.each(function(el, nr){
 				if(nr%2 == 0)
-					key = el
+					key = el;
 				else if(key) {
-					self.params[key] = el
+					self.params[key] = el;
 					key = null
 				}
 			})
@@ -488,8 +486,8 @@ function randomString(length, extra) {
 
 	var comparer = function(a, b) {
 		for (var i = 0, l = keyPaths.length; i < l; i++) {
-			aVal = valueOf(a, keyPaths[i].path);
-			bVal = valueOf(b, keyPaths[i].path);
+			var aVal = valueOf(a, keyPaths[i].path),
+				bVal = valueOf(b, keyPaths[i].path);
 			if (aVal > bVal) return keyPaths[i].sign;
 			if (aVal < bVal) return -keyPaths[i].sign;
 		}
@@ -530,4 +528,4 @@ var createSpinner = function(target, options){
 	}, options);
 
 	return new Spinner(opts).spin(target);
-}
+};