Merge branch 'master' into develop

CHANGES.md

@@ -21,6 +21,16 @@
 * Update Six compatibility library 1.9.0 (r400) to 1.10.0 (r405)
 
 
+### 0.11.3 (2016-01-16 20:00:00 UTC)
+
+* Fix Search Settings display fail
+* Add Audience, Channel 5 (UK), Five US, Fox Channel, FreeForm, Global, HBO Canada, Keshet, More4, Rooster Teeth, TF1,
+  Toon Disney, WE tv, XBox Video
+* Change BET network logo
+* Change provider TB icon
+* Delete 3fm and redundant network logo
+
+
 ### 0.11.2 (2016-01-14 21:10:00 UTC)
 
 * Fix issue with "Add Existing Shows" on new installations

gui/slick/css/style.css

@@ -3577,6 +3577,7 @@ div.formpaginate{
 }
 
 .step-outer{
+	padding-top:10px;
 	overflow:hidden
 }
 

sickbeard/webserve.py

@@ -4066,10 +4066,12 @@ class ConfigSearch(Config):
         t = PageTemplate(headers=self.request.headers, file='config_search.tmpl')
         t.submenu = self.ConfigMenu
         t.using_rls_ignore_words = [(show.indexerid, show.name)
-                                    for show in sickbeard.showList if show.rls_ignore_words.strip()]
+                                    for show in sickbeard.showList if show.rls_ignore_words and
+                                    show.rls_ignore_words.strip()]
         t.using_rls_ignore_words.sort(lambda x, y: cmp(x[1], y[1]), reverse=False)
         t.using_rls_require_words = [(show.indexerid, show.name)
-                                     for show in sickbeard.showList if show.rls_require_words.strip()]
+                                     for show in sickbeard.showList if show.rls_require_words and
+                                     show.rls_require_words.strip()]
         t.using_rls_require_words.sort(lambda x, y: cmp(x[1], y[1]), reverse=False)
         return t.respond()