Merge branch 'develop'

.build/bower.json

@@ -1,5 +1,5 @@
 {
-  "name": "SickRage",
+  "name": "Medusa",
   "private": true,
   "ignore": [
     "**/.*",
@@ -24,9 +24,11 @@
     "jquery-confirm": "~2.5.2",
     "bootstrap-formhelpers": "~2.3.0",
     "isotope": "~2.2.2",
-    "openSans": "https://google-fonts.azurewebsites.net/googleFonts/openSans?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic"
+    "openSans": "https://google-fonts.azurewebsites.net/googleFonts/openSans?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic",
+    "jquery-backstretch": "backstretch#^2.0.4"
   },
   "resolutions": {
-    "bootstrap": "~3.3.5"
+    "bootstrap": "~3.3.5",
+    "jquery": "~2.1.4"
   }
 }

.build/package.json

@@ -25,6 +25,7 @@
     "grunt-contrib-cssmin": "^0.14.0",
     "grunt-contrib-jshint": "^1.0.0",
     "grunt-contrib-sass": "^0.9.2",
+    "grunt-contrib-watch": "^0.6.1",
     "grunt-contrib-uglify": "^0.11.1",
     "grunt-mocha": "^0.4.15",
     "grunt-sass": "^1.1.0",

.pullapprove.yml

@@ -15,3 +15,4 @@ reviewers:
       - p0psicles
       - OmgImAlexis
       - adaur
+      - Thraxis

SickBeard.py

@@ -478,7 +478,7 @@ def load_shows_from_db():
         for sql_show in sql_results:
             try:
                 cur_show = TVShow(sql_show[b'indexer'], sql_show[b'indexer_id'])
-                cur_show.nextEpisode()
+                cur_show.next_episode()
                 sickbeard.showList.append(cur_show)
             except Exception as error:  # pylint: disable=broad-except
                 logger.log('There was an error creating the show in {}: Error {}'.format

gui/slick/css/browser.css

@@ -20,7 +20,7 @@
 }
 
 .fileBrowserDialog ul li a:hover {
-    color: #00f;
+    color: rgb(0, 0, 255);
     background: none;
 }