Hope this fixes the crappy merge...

Conflicts:

	couchpotato/core/_base/_core/main.py
	couchpotato/core/_base/desktop/main.py

couchpotato/templates/_desktop.html

@@ -52,6 +52,22 @@
 					'is_remote': false
 				});
 
+				// Catch errors
+				window.onerror = function(message, file, line){
+
+					Api.request('logging.log', {
+						'data': {
+							'type': 'error',
+							'message': Browser.name + ' ' + Browser.version + ': \n' + message,
+							'page': window.location.href,
+							'file': file,
+							'line': line
+						}
+					});
+
+					return true;
+				}
+
 				Quality.setup({
 					'profiles': {{ fireEvent('profile.all', single = True)|tojson|safe }},
 					'qualities': {{ fireEvent('quality.all', single = True)|tojson|safe }}