diff --git a/data/images/notifiers/boxcar.png b/data/images/notifiers/boxcar.png
deleted file mode 100644
index 3e1a700060..0000000000
Binary files a/data/images/notifiers/boxcar.png and /dev/null differ
diff --git a/data/images/notifiers/boxcar2.png b/data/images/notifiers/boxcar2.png
new file mode 100644
index 0000000000..4bd282c094
Binary files /dev/null and b/data/images/notifiers/boxcar2.png differ
diff --git a/data/images/notifiers/pushalot.png b/data/images/notifiers/pushalot.png
new file mode 100644
index 0000000000..f1d9008c1e
Binary files /dev/null and b/data/images/notifiers/pushalot.png differ
diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl
index b8c472058b..c6ff250f82 100644
--- a/data/interfaces/default/config_notifications.tmpl
+++ b/data/interfaces/default/config_notifications.tmpl
@@ -700,52 +700,92 @@
 
                 <div class="component-group clearfix">
                     <div class="component-group-desc">
-                        <img class="notifier-icon" src="$sbRoot/images/notifiers/boxcar.png" alt="" title="Boxcar" />
-                        <h3><a href="http://boxcar.io/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Boxcar</a></h3>
-                        <p>Universal push notification for iOS. Read your messages where and when you want them! A subscription will be sent if needed.</p>
+                        <img class="notifier-icon" src="$sbRoot/images/notifiers/boxcar2.png" alt="" title="Boxcar2" />
+                        <h3><a href="http://boxcar.io/" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Boxcar2</a></h3>
+                        <p>Personalized Push and Alerts Inbox for your iPhone that lets you manage and live news in real-time.</p>
                     </div>
                     <fieldset class="component-group-list">
                         <div class="field-pair">
-                            <input type="checkbox" class="enabler" name="use_boxcar" id="use_boxcar" #if $sickbeard.USE_BOXCAR then "checked=\"checked\"" else ""# />
-                            <label class="clearfix" for="use_boxcar">
+                            <input type="checkbox" class="enabler" name="use_boxcar2" id="use_boxcar2" #if $sickbeard.USE_BOXCAR2 then "checked=\"checked\"" else ""# />
+                            <label class="clearfix" for="use_boxcar2">
                                 <span class="component-title">Enable</span>
-                                <span class="component-desc">Should Sick Beard send Boxcar notifications?</span>
+                                <span class="component-desc">Should Sick Beard send Boxcar2 notifications?</span>
                             </label>
                         </div>
 
-                        <div id="content_use_boxcar">
+                        <div id="content_use_boxcar2">
                             <div class="field-pair">
-                                <input type="checkbox" name="boxcar_notify_onsnatch" id="boxcar_notify_onsnatch" #if $sickbeard.BOXCAR_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
-                                <label class="clearfix" for="boxcar_notify_onsnatch">
+                                <input type="checkbox" name="boxcar2_notify_onsnatch" id="boxcar2_notify_onsnatch" #if $sickbeard.BOXCAR2_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
+                                <label class="clearfix" for="boxcar2_notify_onsnatch">
                                     <span class="component-title">Notify on Snatch</span>
                                     <span class="component-desc">Send notification when we start a download?</span>
                                 </label>
                             </div>
                             <div class="field-pair">
-                                <input type="checkbox" name="boxcar_notify_ondownload" id="boxcar_notify_ondownload" #if $sickbeard.BOXCAR_NOTIFY_ONDOWNLOAD then "checked=\"checked\"" else ""# />
-                                <label class="clearfix" for="boxcar_notify_ondownload">
+                                <input type="checkbox" name="boxcar2_notify_ondownload" id="boxcar2_notify_ondownload" #if $sickbeard.BOXCAR2_NOTIFY_ONDOWNLOAD then "checked=\"checked\"" else ""# />
+                                <label class="clearfix" for="boxcar2_notify_ondownload">
                                     <span class="component-title">Notify on Download</span>
                                     <span class="component-desc">Send notification when we finish a download?</span>
                                 </label>
                             </div>
                             <div class="field-pair">
                                 <label class="nocheck clearfix">
-                                    <span class="component-title">Boxcar Username</span>
-                                    <input type="text" name="boxcar_username" id="boxcar_username" value="$sickbeard.BOXCAR_USERNAME" size="35" />
+                                    <span class="component-title">Custom Sound</span>
+                                    <select id="boxcar2_sound" name="boxcar2_sound">
+                                        <option value="default" #if $sickbeard.BOXCAR2_SOUND == "default" then 'selected="selected"' else ""#>Default (General)</option>
+                                        <option value="no-sound" #if $sickbeard.BOXCAR2_SOUND == "no-sound" then 'selected="selected"' else ""#>Silent</option>
+                                        <option value="beep-crisp" #if $sickbeard.BOXCAR2_SOUND == "beep-crisp" then 'selected="selected"' else ""#>Beep Crisp</option>
+                                        <option value="beep-soft" #if $sickbeard.BOXCAR2_SOUND == "beep-soft" then 'selected="selected"' else ""#>Beep Soft</option>
+                                        <option value="bell-modern" #if $sickbeard.BOXCAR2_SOUND == "bell-modern" then 'selected="selected"' else ""#>Bell Modern</option>
+                                        <option value="bell-one-tone" #if $sickbeard.BOXCAR2_SOUND == "bell-one-tone" then 'selected="selected"' else ""#>Bell One Tone</option>
+                                        <option value="bell-simple" #if $sickbeard.BOXCAR2_SOUND == "bell-simple" then 'selected="selected"' else ""#>Bell Simple</option>
+                                        <option value="bell-triple" #if $sickbeard.BOXCAR2_SOUND == "bell-triple" then 'selected="selected"' else ""#>Bell Triple</option>
+                                        <option value="bird-1" #if $sickbeard.BOXCAR2_SOUND == "bird-1" then 'selected="selected"' else ""#>Bird 1</option>
+                                        <option value="bird-2" #if $sickbeard.BOXCAR2_SOUND == "bird-2" then 'selected="selected"' else ""#>Bird 2</option>
+                                        <option value="boing" #if $sickbeard.BOXCAR2_SOUND == "boing" then 'selected="selected"' else ""#>Boing</option>
+                                        <option value="cash" #if $sickbeard.BOXCAR2_SOUND == "cash" then 'selected="selected"' else ""#>Cash</option>
+                                        <option value="clanging" #if $sickbeard.BOXCAR2_SOUND == "clanging" then 'selected="selected"' else ""#>Clanging</option>
+                                        <option value="detonator-charge" #if $sickbeard.BOXCAR2_SOUND == "detonator-charge" then 'selected="selected"' else ""#>Detonator Charge</option>
+                                        <option value="digital-alarm" #if $sickbeard.BOXCAR2_SOUND == "digital-alarm" then 'selected="selected"' else ""#>Digital Alarm</option>
+                                        <option value="done" #if $sickbeard.BOXCAR2_SOUND == "done" then 'selected="selected"' else ""#>Done</option>
+                                        <option value="echo" #if $sickbeard.BOXCAR2_SOUND == "echo" then 'selected="selected"' else ""#>Echo</option>
+                                        <option value="flourish" #if $sickbeard.BOXCAR2_SOUND == "flourish" then 'selected="selected"' else ""#>Flourish</option>
+                                        <option value="harp" #if $sickbeard.BOXCAR2_SOUND == "harp" then 'selected="selected"' else ""#>Harp</option>
+                                        <option value="light" #if $sickbeard.BOXCAR2_SOUND == "light" then 'selected="selected"' else ""#>Light</option>
+                                        <option value="magic-chime" #if $sickbeard.BOXCAR2_SOUND == "magic-chime" then 'selected="selected"' else ""#>Magic Chime</option>
+                                        <option value="magic-coin" #if $sickbeard.BOXCAR2_SOUND == "magic-coin" then 'selected="selected"' else ""#>Magic Coin 1</option>
+                                        <option value="notifier-1" #if $sickbeard.BOXCAR2_SOUND == "notifier-1" then 'selected="selected"' else ""#>Notifier 1</option>
+                                        <option value="notifier-2" #if $sickbeard.BOXCAR2_SOUND == "notifier-2" then 'selected="selected"' else ""#>Notifier 2</option>
+                                        <option value="notifier-3" #if $sickbeard.BOXCAR2_SOUND == "notifier-3" then 'selected="selected"' else ""#>Notifier 3</option>
+                                        <option value="orchestral-long" #if $sickbeard.BOXCAR2_SOUND == "orchestral-long" then 'selected="selected"' else ""#>Orchestral Long</option>
+                                        <option value="orchestral-short" #if $sickbeard.BOXCAR2_SOUND == "orchestral-short" then 'selected="selected"' else ""#>Orchestral Short</option>
+                                        <option value="score" #if $sickbeard.BOXCAR2_SOUND == "score" then 'selected="selected"' else ""#>Score</option>
+                                        <option value="success" #if $sickbeard.BOXCAR2_SOUND == "success" then 'selected="selected"' else ""#>Success</option>
+                                        <option value="up" #if $sickbeard.BOXCAR2_SOUND == "up" then 'selected="selected"' else ""#>Up</option>
+                                    </select>
+                                </label>
+                                <label class="nocheck clearfix">
+                                    <span class="component-title">&nbsp;</span>
+                                    <span class="component-desc">Override the default sound selected for the General notification.</span>
+                                </label>
+                            </div>
+                            <div class="field-pair">
+                                <label class="nocheck clearfix">
+                                    <span class="component-title">Boxcar2 Access Token</span>
+                                    <input type="text" name="boxcar2_access_token" id="boxcar2_access_token" value="$sickbeard.BOXCAR2_ACCESS_TOKEN" size="35" />
                                 </label>
                                 <label class="nocheck clearfix">
                                     <span class="component-title">&nbsp;</span>
-                                    <span class="component-desc">Username of your Boxcar account</span>
+                                    <span class="component-desc">Access Token of your Boxcar2 account</span>
                                 </label>
                             </div>
-                            <div class="testNotification" id="testBoxcar-result">Click below to test.</div>
-                            <input type="button" class="btn" value="Test Boxcar" id="testBoxcar" />
+                            <div class="testNotification" id="testBoxcar2-result">Click below to test.</div>
+                            <input type="button" class="btn" value="Test Boxcar2" id="testBoxcar2" />
                             <input type="submit" class="btn config_submitter" value="Save Changes" />
-                        </div><!-- /content_use_boxcar //-->
+                        </div><!-- /content_use_boxcar2 //-->
 
                     </fieldset>
-                </div><!-- /boxcar component-group //-->
-
+                </div><!-- /boxcar2 component-group //-->
 
                 <div class="component-group clearfix">
                     <div class="component-group-desc">
@@ -811,6 +851,54 @@
                     </fieldset>
                 </div><!-- /nma component-group //-->
 
+                <div class="component-group clearfix">
+                    <div class="component-group-desc">
+                        <img class="notifier-icon" src="$sbRoot/images/notifiers/pushalot.png" alt="" title="Pushalot" />
+                        <h3><a href="https://pushalot.com" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href, '_blank'); return false;">Pushalot</a></h3>
+                        <p>Pushalot is a platform for receiving custom push notifications to connected devices running Windows Phone or Windows 8.</p>
+                    </div>
+                    <fieldset class="component-group-list">
+                        <div class="field-pair">
+                            <input type="checkbox" class="enabler" name="use_pushalot" id="use_pushalot" #if $sickbeard.USE_PUSHALOT then "checked=\"checked\"" else ""# />
+                            <label class="clearfix" for="use_pushalot">
+                                <span class="component-title">Enable</span>
+                                <span class="component-desc">Should Sick Beard send Pushalot notifications?</span>
+                            </label>
+                        </div>
+
+                        <div id="content_use_pushalot">
+                            <div class="field-pair">
+                                <input type="checkbox" name="pushalot_notify_onsnatch" id="pushalot_notify_onsnatch" #if $sickbeard.PUSHALOT_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
+                                <label class="clearfix" for="pushalot_notify_onsnatch">
+                                    <span class="component-title">Notify on Snatch</span>
+                                    <span class="component-desc">Send notification when we start a download?</span>
+                                </label>
+                            </div>
+                            <div class="field-pair">
+                                <input type="checkbox" name="pushalot_notify_ondownload" id="pushalot_notify_ondownload" #if $sickbeard.PUSHALOT_NOTIFY_ONDOWNLOAD then "checked=\"checked\"" else ""# />
+                                <label class="clearfix" for="pushalot_notify_ondownload">
+                                    <span class="component-title">Notify on Download</span>
+                                    <span class="component-desc">Send notification when we finish a download?</span>
+                                </label>
+                            </div>
+                            <div class="field-pair">
+                                <label class="nocheck clearfix">
+                                    <span class="component-title">Pushalot Authorization Token</span>
+                                    <input type="text" name="pushalot_authorizationtoken" id="pushalot_authorizationtoken" value="$sickbeard.PUSHALOT_AUTHORIZATIONTOKEN" size="35" />
+                                </label>
+                                <label class="nocheck clearfix">
+                                    <span class="component-title">&nbsp;</span>
+                                    <span class="component-desc">Authorization Token of your Pushalot account</span>
+                                </label>
+                            </div>
+                            <div class="testNotification" id="testPushalot-result">Click below to test.</div>
+                            <input type="button" class="btn" value="Test Pushalot" id="testPushalot" />
+                            <input type="submit" class="btn config_submitter" value="Save Changes" />
+                        </div><!-- /content_use_pushalot //-->
+
+                    </fieldset>
+                </div><!-- /pushalot component-group //-->
+
                 <div class="component-group-save">
                     <input type="submit" class="btn config_submitter" value="Save Changes" />
                 </div><br />
diff --git a/data/interfaces/default/config_postProcessing.tmpl b/data/interfaces/default/config_postProcessing.tmpl
index 8e27d923ed..0ae7e503dd 100644
--- a/data/interfaces/default/config_postProcessing.tmpl
+++ b/data/interfaces/default/config_postProcessing.tmpl
@@ -68,6 +68,17 @@
                             </label>
                         </div>
 
+                        <div class="field-pair">
+                            <label class="nocheck clearfix" for="filter_associated_files">
+                                <span class="component-title">Filter Associated Files</span>
+                                <input type="text" name="filter_associated_files" id="filter_associated_files" value="$sickbeard.FILTER_ASSOCIATED_FILES" size="35" />
+                            </label>
+                            <label class="nocheck clearfix">
+                                <span class="component-title">&nbsp;</span>
+                                <span class="component-desc">Filter associated files by specific non-media file extensions (separated with coma). (eg. .idx, .sub, .en.srt)</span>
+                            </label>
+                        </div>
+
                         <div class="field-pair">
                             <input type="checkbox" name="rename_episodes" id="rename_episodes" #if $sickbeard.RENAME_EPISODES == True then "checked=\"checked\"" else ""# />
                             <label class="clearfix" for="rename_episodes">
diff --git a/data/interfaces/default/home.tmpl b/data/interfaces/default/home.tmpl
index 2a8dbce853..c35c872e34 100644
--- a/data/interfaces/default/home.tmpl
+++ b/data/interfaces/default/home.tmpl
@@ -14,8 +14,34 @@
 
 #set $myDB = $db.DBConnection()
 #set $today = str($datetime.date.today().toordinal())
-#set $downloadedEps = $myDB.select("SELECT showid, COUNT(*) FROM tv_episodes WHERE (status IN ("+",".join([str(x) for x in $Quality.DOWNLOADED + [$ARCHIVED]])+") OR (status IN ("+",".join([str(x) for x in $Quality.SNATCHED + $Quality.SNATCHED_PROPER])+") AND location != '')) AND season != 0 and episode != 0 AND airdate <= "+$today+" GROUP BY showid")
-#set $allEps = $myDB.select("SELECT showid, COUNT(*) FROM tv_episodes WHERE season != 0 and episode != 0 AND (airdate != 1 OR status IN ("+",".join([str(x) for x in ($Quality.DOWNLOADED + $Quality.SNATCHED + $Quality.SNATCHED_PROPER) + [$ARCHIVED]])+")) AND airdate <= "+$today+" AND status != "+str($IGNORED)+" GROUP BY showid")
+#set status_quality = '(' + ','.join([str(x) for x in $Quality.SNATCHED + $Quality.SNATCHED_PROPER]) + ')'
+#set status_download = '(' + ','.join([str(x) for x in $Quality.DOWNLOADED + [$ARCHIVED]]) + ')'
+
+#set $sql_statement = 'SELECT showid, '
+
+#set $sql_statement += '(SELECT COUNT(*) FROM tv_episodes WHERE showid=tv_eps.showid AND season > 0 AND episode > 0 AND status IN ' + $status_quality + ') AS ep_snatched, '
+#set $sql_statement += '(SELECT COUNT(*) FROM tv_episodes WHERE showid=tv_eps.showid AND season > 0 AND episode > 0 AND status IN ' + $status_download + ') AS ep_downloaded, '
+
+#set $sql_statement += '(SELECT COUNT(*) FROM tv_episodes WHERE showid=tv_eps.showid AND season > 0 AND episode > 0 '
+#set $sql_statement += ' AND ((airdate > 1 AND airdate <= ' + $today + ' AND (status = ' + str($SKIPPED) + ' OR status = ' + str($WANTED) + ')) '
+#set $sql_statement += ' OR (status IN ' + status_quality + ') OR (status IN ' + status_download + '))) AS ep_total, '
+
+#set $sql_statement += ' (SELECT airdate FROM tv_episodes WHERE showid=tv_eps.showid AND airdate >= ' + $today + ' AND status = ' + str($UNAIRED) + ' ORDER BY airdate ASC LIMIT 1) AS ep_airs_next '
+#set $sql_statement += ' FROM tv_episodes tv_eps GROUP BY showid'
+
+#set $sql_result = $myDB.select($sql_statement)
+
+#set $show_stat = {}
+#set $max_download_count = 1000
+
+#for $cur_result in $sql_result:
+    #set $show_stat[$cur_result['showid']] = $cur_result
+    #if $cur_result['ep_total'] > $max_download_count:
+        #set $max_download_count = $cur_result['ep_total']
+    #end if
+#end for
+
+#set $max_download_count = $max_download_count * 100
 
 <script type="text/javascript" charset="utf-8">
 <!--
@@ -27,7 +53,7 @@
     },
     format: function(s) {
         if (s.indexOf('Loading...') == 0)
-            return s.replace('Loading...','000');
+          return s.replace('Loading...','000');
         return (s || '').replace(/^(The|A)\s/i,'');
     },
     type: 'text'
@@ -53,16 +79,23 @@
         match = s.match(/^(.*)/);
 
         if (match == null || match[1] == "?")
-            return -10;
+          return -10;
 
         var nums = match[1].split(" / ");
+        if (nums[0].indexOf("+") != -1) {
+            var num_parts = nums[0].split("+");
+            nums[0] = num_parts[0];
+        }
 
-        if (parseInt(nums[0]) === 0)
-            return parseInt(nums[1]);
+        nums[0] = parseInt(nums[0])
+        nums[1] = parseInt(nums[1])
 
-        var finalNum = parseInt((nums[0]/nums[1])*1000)*100;
+        if (nums[0] === 0)
+          return nums[1];
+
+        var finalNum = parseInt($max_download_count*nums[0]/nums[1]);
         if (finalNum > 0)
-            finalNum += parseInt(nums[0]);
+          finalNum += nums[0];
 
         return finalNum;
     },
@@ -74,16 +107,16 @@
     \$("#showListTable:has(tbody tr)").tablesorter({
         sortList: [[5,1],[1,0]],
         textExtraction: {
-            3: function(node) { return \$(node).find("span").text().toLowerCase(); },
-            4: function(node) { return \$(node).find("span").text(); },
-            5: function(node) { return \$(node).find("img").attr("alt"); }
+          3: function(node) { return \$(node).find("span").text().toLowerCase(); },
+          4: function(node) { return \$(node).find("span").text(); },
+          5: function(node) { return \$(node).find("img").attr("alt"); }
         },
         widgets: ['saveSort', 'zebra', 'stickyHeaders'],
         headers: {
-            0: { sorter: 'isoDate' },
-            1: { sorter: 'loadingNames' },
-            3: { sorter: 'quality' },
-            4: { sorter: 'eps' }
+          0: { sorter: 'isoDate' },
+          1: { sorter: 'loadingNames' },
+          3: { sorter: 'quality' },
+          4: { sorter: 'eps' }
         },
         sortStable: true
     });
@@ -94,14 +127,14 @@
 
 <table id="showListTable" class="tablesorter" cellspacing="1" border="0" cellpadding="0">
 
-  <thead><tr><th class="nowrap">Next Ep</th><th>Show</th><th>Network</th><th>Quality</th><th>Downloads</th><th>Active</th><th>Status</th></tr></thead>
-  <tfoot>
-    <tr>
-      <th rowspan="1" colspan="1" align="center"><a href="$sbRoot/home/addShows/">Add Show</a></th>
-      <th rowspan="1" colspan="6"></th>
-    </tr>
-  </tfoot>
-  <tbody>
+    <thead><tr><th class="nowrap">Next Ep</th><th>Show</th><th>Network</th><th>Quality</th><th>Downloads</th><th>Active</th><th>Status</th></tr></thead>
+    <tfoot>
+        <tr>
+        <th rowspan="1" colspan="1" align="center"><a href="$sbRoot/home/addShows/">Add Show</a></th>
+        <th rowspan="1" colspan="6"></th>
+        </tr>
+    </tfoot>
+    <tbody>
 
 #for $curLoadingShow in $sickbeard.showQueueScheduler.action.loadingShowList:
 
@@ -109,72 +142,97 @@
     #continue
   #end if
 
-  <tr>
-    <td align="center">(loading)</td>
-    <td>
-    #if $curLoadingShow.show == None:
-    Loading... ($curLoadingShow.show_name)
-    #else:
-    <a href="displayShow?show=$curLoadingShow.show.tvdbid">$curLoadingShow.show.name</a>
-    #end if
-    </td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-  </tr>
+    <tr>
+        <td align="center">(loading)</td>
+        <td>
+        #if $curLoadingShow.show == None:
+        Loading... ($curLoadingShow.show_name)
+        #else:
+        <a href="displayShow?show=$curLoadingShow.show.tvdbid">$curLoadingShow.show.name</a>
+        #end if
+        </td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+    </tr>
 #end for
 
 #set $myShowList = $list($sickbeard.showList)
 $myShowList.sort(lambda x, y: cmp(x.name, y.name))
 #for $curShow in $myShowList:
-#set $curEp = $curShow.nextEpisode()
-
-#set $curShowDownloads = [x[1] for x in $downloadedEps if int(x[0]) == $curShow.tvdbid]
-#set $curShowAll = [x[1] for x in $allEps if int(x[0]) == $curShow.tvdbid]
-#if len($curShowAll) != 0:
-  #if len($curShowDownloads) != 0:
-    #set $dlStat = str($curShowDownloads[0])+" / "+str($curShowAll[0])
-    #set $nom = $curShowDownloads[0]
-    #set $den = $curShowAll[0]
-  #else
-    #set $dlStat = "0 / "+str($curShowAll[0])
-    #set $nom = 0
-    #set $den = $curShowAll[0]
-  #end if
-#else
-  #set $dlStat = "?"
-  #set $nom = 0
-  #set $den = 1
-#end if
-
-
-  <tr>
-    <td align="center" class="nowrap">#if len($curEp) != 0 then $curEp[0].airdate else ""#</td>
-    <td class="tvShow"><a href="$sbRoot/home/displayShow?show=$curShow.tvdbid">$curShow.name</a></td>
-    <td>$curShow.network</td>
-#if $curShow.quality in $qualityPresets:
-    <td align="center"><span class="quality $qualityPresetStrings[$curShow.quality]">$qualityPresetStrings[$curShow.quality]</span></td>
-#else:
-    <td align="center"><span class="quality Custom">Custom</span></td>
-#end if
-    <td align="center"><span style="display: none;">$dlStat</span><div id="progressbar$curShow.tvdbid" style="position:relative;"></div>
-        <script type="text/javascript">
-        <!--
-            \$(function() {
-               \$("\#progressbar$curShow.tvdbid").progressbar({
-                   value: parseInt($nom) * 100 / parseInt($den)
-               });
-               \$("\#progressbar$curShow.tvdbid").append( "<div class='progressbarText'>$dlStat</div>" )
-            });
-        //-->
-        </script>
-    </td>
-    <td align="center"><img src="$sbRoot/images/#if int($curShow.paused) == 0 and $curShow.status != "Ended" then "yes16.png\" alt=\"Y\"" else "no16.png\" alt=\"N\""# width="16" height="16" /></td>
-    <td align="center">$curShow.status</td>
-  </tr>
 
+    #set $cur_airs_next = ''
+    #set $cur_snatched = 0
+    #set $cur_downloaded = 0
+    #set $cur_total = 0
+    #set $download_stat_tip = ''
+
+    #if $curShow.tvdbid in $show_stat:
+        #set $cur_airs_next = $show_stat[$curShow.tvdbid]['ep_airs_next']
+
+        #set $cur_snatched = $show_stat[$curShow.tvdbid]['ep_snatched']
+        #if not $cur_snatched:
+            #set $cur_snatched = 0
+        #end if
+
+        #set $cur_downloaded = $show_stat[$curShow.tvdbid]['ep_downloaded']
+        #if not $cur_downloaded:
+            #set $cur_downloaded = 0
+        #end if
+
+        #set $cur_total = $show_stat[$curShow.tvdbid]['ep_total']
+        #if not $cur_total:
+            #set $cur_total = 0
+        #end if
+    #end if
+
+    #if $cur_total != 0:
+        #set $download_stat = str($cur_downloaded + $cur_snatched)
+        #set $download_stat_tip = "Downloaded: " + str($cur_downloaded)
+        #if $cur_snatched > 0:
+            #set $download_stat_tip = download_stat_tip + "&#013;" + "Snatched: " + str($cur_snatched)
+        #end if
+        #set $download_stat = download_stat + " / " + str($cur_total)
+        #set $download_stat_tip = download_stat_tip + "&#013;" + "Total: " + str($cur_total)
+    #else
+        #set $download_stat = '?'
+        #set $download_stat_tip = "no data"
+    #end if
+
+    #set $nom = $cur_downloaded
+    #set $den = $cur_total
+    #if $den == 0:
+        #set $den = 1
+    #end if
+
+    #set $progressbar_percent = $nom * 100 / $den
+
+    <tr>
+        <td align="center" class="nowrap">#if $cur_airs_next then datetime.date.fromordinal($cur_airs_next).strftime('%Y-%m-%d') else ""#</td>
+        <td class="tvShow"><a href="$sbRoot/home/displayShow?show=$curShow.tvdbid">$curShow.name</a></td>
+        <td>$curShow.network</td>
+    #if $curShow.quality in $qualityPresets:
+        <td align="center"><span class="quality $qualityPresetStrings[$curShow.quality]">$qualityPresetStrings[$curShow.quality]</span></td>
+    #else:
+        <td align="center"><span class="quality Custom">Custom</span></td>
+    #end if
+        <td align="center"><span style="display: none;">$download_stat</span><div id="progressbar$curShow.tvdbid" style="position:relative;"></div>
+          <script type="text/javascript">
+          <!--
+                \$(function() {
+                 \$("\#progressbar$curShow.tvdbid").progressbar({
+                     value: $progressbar_percent
+                 });
+                 \$("\#progressbar$curShow.tvdbid").append("<div class='progressbarText' title='$download_stat_tip'>$download_stat</div>")
+                });
+          //-->
+          </script>
+        </td>
+        <td align="center"><img src="$sbRoot/images/#if int($curShow.paused) == 0 and $curShow.status != "Ended" then "yes16.png\" alt=\"Y\"" else "no16.png\" alt=\"N\""# width="16" height="16" /></td>
+        <td align="center">$curShow.status</td>
+    </tr>
 
 #end for
 </tbody>
diff --git a/data/interfaces/default/inc_bottom.tmpl b/data/interfaces/default/inc_bottom.tmpl
index 3e42fd0cb8..357ba510b7 100644
--- a/data/interfaces/default/inc_bottom.tmpl
+++ b/data/interfaces/default/inc_bottom.tmpl
@@ -9,16 +9,40 @@
     <div class="container footer">
         #set $myDB = $db.DBConnection()
         #set $today = str($datetime.date.today().toordinal())
-        #set $numShows = len($sickbeard.showList)
-        #set $numGoodShows = len([x for x in $sickbeard.showList if x.paused == 0 and x.status != "Ended"])
-        #set $numDLEpisodes = $myDB.select("SELECT COUNT(*) FROM tv_episodes WHERE status IN ("+",".join([str(x) for x in $Quality.DOWNLOADED + [$ARCHIVED]])+") AND season != 0 and episode != 0 AND airdate <= " + $today + "")[0][0]
-        #set $numEpisodes = $myDB.select("SELECT COUNT(*) FROM tv_episodes WHERE season != 0 and episode != 0 AND (airdate != 1 OR status IN ("+",".join([str(x) for x in ($Quality.DOWNLOADED + $Quality.SNATCHED + $Quality.SNATCHED_PROPER) + [$ARCHIVED]]) + ")) AND airdate <= " + $today + " AND status != " + str($IGNORED) + "")[0][0]
-        <b>$numShows shows</b> ($numGoodShows active) | <b>$numDLEpisodes/$numEpisodes</b> episodes downloaded 
+        #set status_quality = '(' + ','.join([str(quality) for quality in $Quality.SNATCHED + $Quality.SNATCHED_PROPER]) + ')'
+        #set status_download = '(' + ','.join([str(quality) for quality in $Quality.DOWNLOADED + [$ARCHIVED]]) + ')'
+
+        #set $sql_statement = 'SELECT '
+
+        #set $sql_statement += '(SELECT COUNT(*) FROM tv_episodes WHERE season > 0 AND episode > 0 AND status IN ' + $status_quality + ') AS ep_snatched, '
+        #set $sql_statement += '(SELECT COUNT(*) FROM tv_episodes WHERE season > 0 AND episode > 0 AND status IN ' + $status_download + ') AS ep_downloaded, '
+
+        #set $sql_statement += '(SELECT COUNT(*) FROM tv_episodes WHERE season > 0 AND episode > 0 '
+        #set $sql_statement += ' AND ((airdate > 1 AND airdate <= ' + $today + ' AND (status = ' + str($SKIPPED) + ' OR status = ' + str($WANTED) + ')) '
+        #set $sql_statement += ' OR (status IN ' + status_quality + ') OR (status IN ' + status_download + '))) AS ep_total '
+
+        #set $sql_statement += ' FROM tv_episodes tv_eps LIMIT 1'
+
+        #set $sql_result = $myDB.select($sql_statement)
+
+        #set $shows_total = len($sickbeard.showList)
+        #set $shows_active = len([show for show in $sickbeard.showList if show.paused == 0 and show.status != "Ended"])
+
+        #if $sql_result:
+            #set $ep_snatched = $sql_result[0]['ep_snatched']
+            #set $ep_downloaded = $sql_result[0]['ep_downloaded']
+            #set $ep_total = $sql_result[0]['ep_total']
+        #else
+            #set $ep_snatched = 0
+            #set $ep_downloaded = 0
+            #set $ep_total = 0
+        #end if
+
+        <b>$shows_total shows</b> ($shows_active active) | <b><%=ep_downloaded%></b>#if $ep_snatched > 0 then " (+" + str($ep_snatched) + " snatched)" else ""#<b> / $ep_total</b> episodes downloaded
         <br />
         <b>Search</b>: <%=str(sickbeard.currentSearchScheduler.timeLeft()).split('.')[0]%> |
-        <b>Backlog</b>: $sickbeard.backlogSearchScheduler.nextRun().strftime("%Y-%m-%d").decode($sickbeard.SYS_ENCODING)
+        <b>Backlog</b>: $sickbeard.backlogSearchScheduler.nextRun().strftime("%Y-%m-%d")
     </div> <!-- /container footer -->
 </footer>
-
 </body>
 </html>
diff --git a/data/js/configNotifications.js b/data/js/configNotifications.js
index c23d689c3f..10b5691f48 100644
--- a/data/js/configNotifications.js
+++ b/data/js/configNotifications.js
@@ -8,12 +8,12 @@ $(document).ready(function () {
             $("#testGrowl-result").html("Please fill out the necessary fields above.");
             return;
         }
-        $(this).attr("disabled", true);
+        $(this).prop("disabled", true);
         $("#testGrowl-result").html(loading);
         $.get(sbRoot + "/home/testGrowl", {'host': growl_host, 'password': growl_password})
             .done(function (data) {
                 $("#testGrowl-result").html(data);
-                $("#testGrowl").attr("disabled", false);
+                $("#testGrowl").prop("disabled", false);
             });
     });
 
@@ -24,12 +24,12 @@ $(document).ready(function () {
             $("#testProwl-result").html("Please fill out the necessary fields above.");
             return;
         }
-        $(this).attr("disabled", true);
+        $(this).prop("disabled", true);
         $("#testProwl-result").html(loading);
         $.get(sbRoot + "/home/testProwl", {'prowl_api': prowl_api, 'prowl_priority': prowl_priority})
             .done(function (data) {
                 $("#testProwl-result").html(data);
-                $("#testProwl").attr("disabled", false);
+                $("#testProwl").prop("disabled", false);
             });
     });
 
@@ -41,12 +41,12 @@ $(document).ready(function () {
             $("#testXBMC-result").html("Please fill out the necessary fields above.");
             return;
         }
-        $(this).attr("disabled", true);
+        $(this).prop("disabled", true);
         $("#testXBMC-result").html(loading);
         $.get(sbRoot + "/home/testXBMC", {'host': xbmc_host, 'username': xbmc_username, 'password': xbmc_password})
             .done(function (data) {
                 $("#testXBMC-result").html(data);
-                $("#testXBMC").attr("disabled", false);
+                $("#testXBMC").prop("disabled", false);
             });
     });
 
@@ -58,27 +58,28 @@ $(document).ready(function () {
             $("#testPLEX-result").html("Please fill out the necessary fields above.");
             return;
         }
-        $(this).attr("disabled", true);
+        $(this).prop("disabled", true);
         $("#testPLEX-result").html(loading);
         $.get(sbRoot + "/home/testPLEX", {'host': plex_host, 'username': plex_username, 'password': plex_password})
             .done(function (data) {
                 $("#testPLEX-result").html(data);
-                $("#testPLEX").attr("disabled", false);
+                $("#testPLEX").prop("disabled", false);
             });
     });
 
-    $("#testBoxcar").click(function () {
-        var boxcar_username = $.trim($("#boxcar_username").val());
-        if (!boxcar_username) {
-            $("#testBoxcar-result").html("Please fill out the necessary fields above.");
+    $("#testBoxcar2").click(function () {
+        var boxcar2_access_token = $.trim($("#boxcar2_access_token").val());
+        var boxcar2_sound = $("#boxcar2_sound").val() || "default";
+        if (!boxcar2_access_token) {
+            $("#testBoxcar2-result").html("Please fill out the necessary fields above.");
             return;
         }
-        $(this).attr("disabled", true);
-        $("#testBoxcar-result").html(loading);
-        $.get(sbRoot + "/home/testBoxcar", {'username': boxcar_username})
+        $(this).prop("disabled", true);
+        $("#testBoxcar2-result").html(loading);
+        $.get(sbRoot + "/home/testBoxcar2", {'accessToken': boxcar2_access_token, 'sound': boxcar2_sound})
             .done(function (data) {
-                $("#testBoxcar-result").html(data);
-                $("#testBoxcar").attr("disabled", false);
+                $("#testBoxcar2-result").html(data);
+                $("#testBoxcar2").prop("disabled", false);
             });
     });
 
@@ -88,12 +89,12 @@ $(document).ready(function () {
             $("#testPushover-result").html("Please fill out the necessary fields above.");
             return;
         }
-        $(this).attr("disabled", true);
+        $(this).prop("disabled", true);
         $("#testPushover-result").html(loading);
         $.get(sbRoot + "/home/testPushover", {'userKey': pushover_userkey})
             .done(function (data) {
                 $("#testPushover-result").html(data);
-                $("#testPushover").attr("disabled", false);
+                $("#testPushover").prop("disabled", false);
             });
     });
 
@@ -136,8 +137,8 @@ $(document).ready(function () {
         $.get(sbRoot + "/home/settingsNMJ", {'host': nmj_host},
             function (data) {
                 if (data === null) {
-                    $("#nmj_database").removeAttr("readonly");
-                    $("#nmj_mount").removeAttr("readonly");
+                    $("#nmj_database").prop("readonly", false);
+                    $("#nmj_mount").prop("readonly", false);
                 }
                 var JSONData = $.parseJSON(data);
                 $("#testNMJ-result").html(JSONData.message);
@@ -145,14 +146,14 @@ $(document).ready(function () {
                 $("#nmj_mount").val(JSONData.mount);
 
                 if (JSONData.database) {
-                    $("#nmj_database").attr("readonly", true);
+                    $("#nmj_database").prop("readonly", true);
                 } else {
-                    $("#nmj_database").removeAttr("readonly");
+                    $("#nmj_database").prop("readonly", false);
                 }
                 if (JSONData.mount) {
-                    $("#nmj_mount").attr("readonly", true);
+                    $("#nmj_mount").prop("readonly", true);
                 } else {
-                    $("#nmj_mount").removeAttr("readonly");
+                    $("#nmj_mount").prop("readonly", false);
                 }
             });
     });
@@ -165,12 +166,12 @@ $(document).ready(function () {
             $("#testNMJ-result").html("Please fill out the necessary fields above.");
             return;
         }
-        $(this).attr("disabled", true);
+        $(this).prop("disabled", true);
         $("#testNMJ-result").html(loading);
         $.get(sbRoot + "/home/testNMJ", {'host': nmj_host, 'database': nmj_database, 'mount': nmj_mount})
             .done(function (data) {
                 $("#testNMJ-result").html(data);
-                $("#testNMJ").attr("disabled", false);
+                $("#testNMJ").prop("disabled", false);
             });
     });
 
@@ -196,16 +197,16 @@ $(document).ready(function () {
         $.get(sbRoot + "/home/settingsNMJv2", {'host': nmjv2_host, 'dbloc': nmjv2_dbloc, 'instance': nmjv2_dbinstance},
         function (data) {
             if (data == null) {
-                $("#nmjv2_database").removeAttr("readonly");
+                $("#nmjv2_database").prop("readonly", false);
             }
             var JSONData = $.parseJSON(data || "null");
             $("#testNMJv2-result").html(JSONData.message);
             $("#nmjv2_database").val(JSONData.database);
 
             if (JSONData.database) {
-                $("#nmjv2_database").attr("readonly", true);
+                $("#nmjv2_database").prop("readonly", true);
             } else {
-                $("#nmjv2_database").removeAttr("readonly");
+                $("#nmjv2_database").prop("readonly", false);
             }
         });
     });
@@ -216,12 +217,12 @@ $(document).ready(function () {
             $("#testNMJv2-result").html("Please fill out the necessary fields above.");
             return;
         }
-        $(this).attr("disabled", true);
+        $(this).prop("disabled", true);
         $("#testNMJv2-result").html(loading);
         $.get(sbRoot + "/home/testNMJv2", {'host': nmjv2_host})
             .done(function (data) {
                 $("#testNMJv2-result").html(data);
-                $("#testNMJv2").attr("disabled", false);
+                $("#testNMJv2").prop("disabled", false);
             });
     });
 
@@ -233,12 +234,12 @@ $(document).ready(function () {
             $("#testTrakt-result").html("Please fill out the necessary fields above.");
             return;
         }
-        $(this).attr("disabled", true);
+        $(this).prop("disabled", true);
         $("#testTrakt-result").html(loading);
         $.get(sbRoot + "/home/testTrakt", {'api': trakt_api, 'username': trakt_username, 'password': trakt_password})
             .done(function (data) {
                 $("#testTrakt-result").html(data);
-                $("#testTrakt").attr("disabled", false);
+                $("#testTrakt").prop("disabled", false);
             });
     });
 
@@ -249,22 +250,37 @@ $(document).ready(function () {
             $("#testNMA-result").html("Please fill out the necessary fields above.");
             return;
         }
-        $(this).attr("disabled", true);
+        $(this).prop("disabled", true);
         $("#testNMA-result").html(loading);
         $.get(sbRoot + "/home/testNMA", {'nma_api': nma_api, 'nma_priority': nma_priority})
             .done(function (data) {
                 $("#testNMA-result").html(data);
-                $("#testNMA").attr("disabled", false);
+                $("#testNMA").prop("disabled", false);
+            });
+    });
+
+    $("#testPushalot").click(function () {
+        var pushalot_authorizationtoken = $.trim($("#pushalot_authorizationtoken").val());
+        if (!pushalot_authorizationtoken) {
+            $("#testPushalot-result").html("Please fill out the necessary fields above.");
+            return;
+        }
+        $(this).prop("disabled", true);
+        $("#testPushalot-result").html(loading);
+        $.get(sbRoot + "/home/testPushalot", {'authorizationtoken': pushalot_authorizationtoken})
+            .done(function (data) {
+                $("#testPushalot-result").html(data);
+                $("#testPushalot").prop("disabled", false);
             });
     });
 
     $("#testSynoNotify").click(function () {
-        $(this).attr("disabled", true);
+        $(this).prop("disabled", true);
         $("#testSynoNotify-result").html(loading);
         $.get(sbRoot + "/home/testSynoNotify")
             .done(function (data) {
                 $("#testSynoNotify-result").html(data);
-                $("#testSynoNotify").attr("disabled", false);
+                $("#testSynoNotify").prop("disabled", false);
             });
     });
 
diff --git a/data/js/rootDirs.js b/data/js/rootDirs.js
index 4c414bbbc9..27d781a0de 100644
--- a/data/js/rootDirs.js
+++ b/data/js/rootDirs.js
@@ -43,8 +43,8 @@ $(document).ready(function() {
             setDefault($('#rootDirs option').attr('id'));
         }
 
-        $.get(sbRoot + '/config/general/saveRootDirs', { rootDirString: $('#rootDirText').val() });
         refreshRootDirs();
+        $.get(sbRoot + '/config/general/saveRootDirs', { rootDirString: $('#rootDirText').val() });
 
     }
 
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py
index 0f9a634cae..b259ac18da 100644
--- a/sickbeard/__init__.py
+++ b/sickbeard/__init__.py
@@ -183,6 +183,7 @@
 PROCESS_AUTOMATICALLY = False
 KEEP_PROCESSED_DIR = False
 MOVE_ASSOCIATED_FILES = False
+FILTER_ASSOCIATED_FILES = None
 TV_DOWNLOAD_DIR = None
 
 NZBS = False
@@ -245,12 +246,11 @@
 TWITTER_PASSWORD = None
 TWITTER_PREFIX = None
 
-USE_BOXCAR = False
-BOXCAR_NOTIFY_ONSNATCH = False
-BOXCAR_NOTIFY_ONDOWNLOAD = False
-BOXCAR_USERNAME = None
-BOXCAR_PASSWORD = None
-BOXCAR_PREFIX = None
+USE_BOXCAR2 = False
+BOXCAR2_NOTIFY_ONSNATCH = False
+BOXCAR2_NOTIFY_ONDOWNLOAD = False
+BOXCAR2_ACCESS_TOKEN = None
+BOXCAR2_SOUND = None
 
 USE_PUSHOVER = False
 PUSHOVER_NOTIFY_ONSNATCH = False
@@ -295,6 +295,11 @@
 NMA_API = None
 NMA_PRIORITY = 0
 
+USE_PUSHALOT = False
+PUSHALOT_NOTIFY_ONSNATCH = False
+PUSHALOT_NOTIFY_ONDOWNLOAD = False
+PUSHALOT_AUTHORIZATIONTOKEN = None
+
 COMING_EPS_LAYOUT = None
 COMING_EPS_DISPLAY_PAUSED = None
 COMING_EPS_SORT = None
@@ -335,6 +340,7 @@ def initialize(consoleLogging=True):
                 USE_GROWL, GROWL_HOST, GROWL_PASSWORD, USE_PROWL, PROWL_NOTIFY_ONSNATCH, PROWL_NOTIFY_ONDOWNLOAD, PROWL_API, PROWL_PRIORITY, PROG_DIR, \
                 USE_PYTIVO, PYTIVO_NOTIFY_ONSNATCH, PYTIVO_NOTIFY_ONDOWNLOAD, PYTIVO_UPDATE_LIBRARY, PYTIVO_HOST, PYTIVO_SHARE_NAME, PYTIVO_TIVO_NAME, \
                 USE_NMA, NMA_NOTIFY_ONSNATCH, NMA_NOTIFY_ONDOWNLOAD, NMA_API, NMA_PRIORITY, \
+                USE_PUSHALOT, PUSHALOT_NOTIFY_ONSNATCH, PUSHALOT_NOTIFY_ONDOWNLOAD, PUSHALOT_AUTHORIZATIONTOKEN, \
                 versionCheckScheduler, VERSION_NOTIFY, PROCESS_AUTOMATICALLY, \
                 KEEP_PROCESSED_DIR, TV_DOWNLOAD_DIR, TVDB_BASE_URL, MIN_SEARCH_FREQUENCY, \
                 showQueueScheduler, searchQueueScheduler, ROOT_DIRS, CACHE_DIR, ACTUAL_CACHE_DIR, TVDB_API_PARMS, \
@@ -342,12 +348,12 @@ def initialize(consoleLogging=True):
                 RENAME_EPISODES, properFinderScheduler, PROVIDER_ORDER, autoPostProcesserScheduler, \
                 WOMBLE, OMGWTFNZBS, OMGWTFNZBS_USERNAME, OMGWTFNZBS_APIKEY, providerList, newznabProviderList, \
                 EXTRA_SCRIPTS, USE_TWITTER, TWITTER_USERNAME, TWITTER_PASSWORD, TWITTER_PREFIX, \
-                USE_BOXCAR, BOXCAR_USERNAME, BOXCAR_PASSWORD, BOXCAR_NOTIFY_ONDOWNLOAD, BOXCAR_NOTIFY_ONSNATCH, \
+                USE_BOXCAR2, BOXCAR2_ACCESS_TOKEN, BOXCAR2_NOTIFY_ONDOWNLOAD, BOXCAR2_NOTIFY_ONSNATCH, BOXCAR2_SOUND, \
                 USE_PUSHOVER, PUSHOVER_USERKEY, PUSHOVER_NOTIFY_ONDOWNLOAD, PUSHOVER_NOTIFY_ONSNATCH, \
                 USE_LIBNOTIFY, LIBNOTIFY_NOTIFY_ONSNATCH, LIBNOTIFY_NOTIFY_ONDOWNLOAD, USE_NMJ, NMJ_HOST, NMJ_DATABASE, NMJ_MOUNT, USE_NMJv2, NMJv2_HOST, NMJv2_DATABASE, NMJv2_DBLOC, \
                 USE_SYNOINDEX, SYNOINDEX_NOTIFY_ONSNATCH, SYNOINDEX_NOTIFY_ONDOWNLOAD, SYNOINDEX_UPDATE_LIBRARY, \
                 USE_LISTVIEW, METADATA_XBMC, METADATA_XBMC_12PLUS, METADATA_MEDIABROWSER, METADATA_MEDE8ER, METADATA_PS3, metadata_provider_dict, \
-                GIT_PATH, MOVE_ASSOCIATED_FILES, \
+                GIT_PATH, MOVE_ASSOCIATED_FILES, FILTER_ASSOCIATED_FILES, \
                 COMING_EPS_LAYOUT, COMING_EPS_SORT, COMING_EPS_DISPLAY_PAUSED, METADATA_WDTV, METADATA_TIVO, IGNORE_WORDS, CREATE_MISSING_SHOW_DIRS, \
                 ADD_SHOWS_WO_DIR, ANON_REDIRECT
 
@@ -429,8 +435,8 @@ def initialize(consoleLogging=True):
 
         PROVIDER_ORDER = check_setting_str(CFG, 'General', 'provider_order', '').split()
 
-        NAMING_PATTERN = check_setting_str(CFG, 'General', 'naming_pattern', '')
-        NAMING_ABD_PATTERN = check_setting_str(CFG, 'General', 'naming_abd_pattern', '')
+        NAMING_PATTERN = check_setting_str(CFG, 'General', 'naming_pattern', '%SN - %Sx%0E - %EN')
+        NAMING_ABD_PATTERN = check_setting_str(CFG, 'General', 'naming_abd_pattern', '%SN - %A-D - %EN')
         NAMING_CUSTOM_ABD = check_setting_int(CFG, 'General', 'naming_custom_abd', 0)
         NAMING_MULTI_EP = check_setting_int(CFG, 'General', 'naming_multi_ep', 1)
         NAMING_FORCE_FOLDERS = naming.check_force_season_folders()
@@ -453,6 +459,7 @@ def initialize(consoleLogging=True):
         RENAME_EPISODES = check_setting_int(CFG, 'General', 'rename_episodes', 1)
         KEEP_PROCESSED_DIR = check_setting_int(CFG, 'General', 'keep_processed_dir', 1)
         MOVE_ASSOCIATED_FILES = check_setting_int(CFG, 'General', 'move_associated_files', 0)
+        FILTER_ASSOCIATED_FILES = check_setting_str(CFG, 'General', 'filter_associated_files', '')
         CREATE_MISSING_SHOW_DIRS = check_setting_int(CFG, 'General', 'create_missing_show_dirs', 0)
         ADD_SHOWS_WO_DIR = check_setting_int(CFG, 'General', 'add_shows_wo_dir', 0)
 
@@ -575,11 +582,12 @@ def initialize(consoleLogging=True):
         TWITTER_PASSWORD = check_setting_str(CFG, 'Twitter', 'twitter_password', '')
         TWITTER_PREFIX = check_setting_str(CFG, 'Twitter', 'twitter_prefix', 'Sick Beard')
 
-        CheckSection(CFG, 'Boxcar')
-        USE_BOXCAR = bool(check_setting_int(CFG, 'Boxcar', 'use_boxcar', 0))
-        BOXCAR_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'Boxcar', 'boxcar_notify_onsnatch', 0))
-        BOXCAR_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Boxcar', 'boxcar_notify_ondownload', 0))
-        BOXCAR_USERNAME = check_setting_str(CFG, 'Boxcar', 'boxcar_username', '')
+        CheckSection(CFG, 'Boxcar2')
+        USE_BOXCAR2 = bool(check_setting_int(CFG, 'Boxcar2', 'use_boxcar2', 0))
+        BOXCAR2_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'Boxcar2', 'boxcar2_notify_onsnatch', 0))
+        BOXCAR2_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Boxcar2', 'boxcar2_notify_ondownload', 0))
+        BOXCAR2_ACCESS_TOKEN = check_setting_str(CFG, 'Boxcar2', 'boxcar2_access_token', '')
+        BOXCAR2_SOUND = check_setting_str(CFG, 'Boxcar2', 'boxcar2_sound', 'default')
 
         CheckSection(CFG, 'Pushover')
         USE_PUSHOVER = bool(check_setting_int(CFG, 'Pushover', 'use_pushover', 0))
@@ -632,6 +640,12 @@ def initialize(consoleLogging=True):
         NMA_API = check_setting_str(CFG, 'NMA', 'nma_api', '')
         NMA_PRIORITY = check_setting_str(CFG, 'NMA', 'nma_priority', "0")
 
+        CheckSection(CFG, 'Pushalot')
+        USE_PUSHALOT = bool(check_setting_int(CFG, 'Pushalot', 'use_pushalot', 0))
+        PUSHALOT_NOTIFY_ONSNATCH = bool(check_setting_int(CFG, 'Pushalot', 'pushalot_notify_onsnatch', 0))
+        PUSHALOT_NOTIFY_ONDOWNLOAD = bool(check_setting_int(CFG, 'Pushalot', 'pushalot_notify_ondownload', 0))
+        PUSHALOT_AUTHORIZATIONTOKEN = check_setting_str(CFG, 'Pushalot', 'pushalot_authorizationtoken', '')
+
         if not os.path.isfile(CONFIG_FILE):
             logger.log(u"Unable to find '" + CONFIG_FILE + "', all settings will be default!", logger.DEBUG)
             save_config()
@@ -685,12 +699,10 @@ def initialize(consoleLogging=True):
                                                  threadName="SHOWQUEUE",
                                                  silent=True)
 
-        showUpdaterInstance = showUpdater.ShowUpdater()  # the interval for this is stored inside the class
-        showUpdateScheduler = scheduler.Scheduler(showUpdaterInstance,
-                                                  cycleTime=showUpdaterInstance.updateInterval,
+        showUpdateScheduler = scheduler.Scheduler(showUpdater.ShowUpdater(),
+                                                  cycleTime=datetime.timedelta(hours=1),
                                                   threadName="SHOWUPDATER",
-                                                  run_delay=showUpdaterInstance.updateInterval,
-                                                  silent=True
+                                                  start_time=datetime.time(hour=3)  # 3 AM
                                                   )
 
         # searchers
@@ -703,23 +715,21 @@ def initialize(consoleLogging=True):
         currentSearchScheduler = scheduler.Scheduler(searchCurrent.CurrentSearcher(),
                                                      cycleTime=datetime.timedelta(minutes=SEARCH_FREQUENCY),
                                                      threadName="SEARCH",
-                                                     run_delay=datetime.timedelta(minutes=5)
+                                                     run_delay=datetime.timedelta(minutes=1)
                                                      )
 
         backlogSearchScheduler = searchBacklog.BacklogSearchScheduler(searchBacklog.BacklogSearcher(),
                                                                       cycleTime=datetime.timedelta(minutes=get_backlog_cycle_time()),
                                                                       threadName="BACKLOG",
-                                                                      run_delay=datetime.timedelta(minutes=17)
+                                                                      run_delay=datetime.timedelta(minutes=7)
                                                                       )
 
         backlogSearchScheduler.action.cycleTime = BACKLOG_SEARCH_FREQUENCY
 
-        properFinderInstance = properFinder.ProperFinder()  # the interval for this is stored inside the class
-        properFinderScheduler = scheduler.Scheduler(properFinderInstance,
-                                                    cycleTime=properFinderInstance.updateInterval,
+        properFinderScheduler = scheduler.Scheduler(properFinder.ProperFinder(),
+                                                    cycleTime=datetime.timedelta(hours=1),
                                                     threadName="FINDPROPERS",
-                                                    run_delay=properFinderInstance.updateInterval,
-                                                    silent=True
+                                                    start_time=datetime.time(hour=1)  # 1 AM
                                                     )
 
         # processors
@@ -1003,6 +1013,7 @@ def save_config():
     new_config['General']['tv_download_dir'] = TV_DOWNLOAD_DIR
     new_config['General']['keep_processed_dir'] = int(KEEP_PROCESSED_DIR)
     new_config['General']['move_associated_files'] = int(MOVE_ASSOCIATED_FILES)
+    new_config['General']['filter_associated_files'] = FILTER_ASSOCIATED_FILES
     new_config['General']['process_automatically'] = int(PROCESS_AUTOMATICALLY)
     new_config['General']['rename_episodes'] = int(RENAME_EPISODES)
     new_config['General']['create_missing_show_dirs'] = int(CREATE_MISSING_SHOW_DIRS)
@@ -1107,11 +1118,12 @@ def save_config():
     new_config['Twitter']['twitter_password'] = TWITTER_PASSWORD
     new_config['Twitter']['twitter_prefix'] = TWITTER_PREFIX
 
-    new_config['Boxcar'] = {}
-    new_config['Boxcar']['use_boxcar'] = int(USE_BOXCAR)
-    new_config['Boxcar']['boxcar_notify_onsnatch'] = int(BOXCAR_NOTIFY_ONSNATCH)
-    new_config['Boxcar']['boxcar_notify_ondownload'] = int(BOXCAR_NOTIFY_ONDOWNLOAD)
-    new_config['Boxcar']['boxcar_username'] = BOXCAR_USERNAME
+    new_config['Boxcar2'] = {}
+    new_config['Boxcar2']['use_boxcar2'] = int(USE_BOXCAR2)
+    new_config['Boxcar2']['boxcar2_notify_onsnatch'] = int(BOXCAR2_NOTIFY_ONSNATCH)
+    new_config['Boxcar2']['boxcar2_notify_ondownload'] = int(BOXCAR2_NOTIFY_ONDOWNLOAD)
+    new_config['Boxcar2']['boxcar2_access_token'] = BOXCAR2_ACCESS_TOKEN
+    new_config['Boxcar2']['boxcar2_sound'] = BOXCAR2_SOUND
 
     new_config['Pushover'] = {}
     new_config['Pushover']['use_pushover'] = int(USE_PUSHOVER)
@@ -1164,6 +1176,12 @@ def save_config():
     new_config['NMA']['nma_api'] = NMA_API
     new_config['NMA']['nma_priority'] = NMA_PRIORITY
 
+    new_config['Pushalot'] = {}
+    new_config['Pushalot']['use_pushalot'] = int(USE_PUSHALOT)
+    new_config['Pushalot']['pushalot_notify_onsnatch'] = int(PUSHALOT_NOTIFY_ONSNATCH)
+    new_config['Pushalot']['pushalot_notify_ondownload'] = int(PUSHALOT_NOTIFY_ONDOWNLOAD)
+    new_config['Pushalot']['pushalot_authorizationtoken'] = PUSHALOT_AUTHORIZATIONTOKEN
+
     new_config['Newznab'] = {}
     new_config['Newznab']['newznab_data'] = NEWZNAB_DATA
 
@@ -1192,13 +1210,13 @@ def launchBrowser(startPort=None):
 
 
 def getEpList(epIDs, showid=None):
-    if epIDs == None or len(epIDs) == 0:
+    if epIDs is None or len(epIDs) == 0:
         return []
 
     query = "SELECT * FROM tv_episodes WHERE tvdbid in (%s)" % (",".join(['?'] * len(epIDs)),)
     params = epIDs
 
-    if showid != None:
+    if showid is not None:
         query += " AND showid = ?"
         params.append(showid)
 
diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py
index db9cb7348d..282cdc2636 100644
--- a/sickbeard/helpers.py
+++ b/sickbeard/helpers.py
@@ -18,6 +18,7 @@
 
 from __future__ import with_statement
 
+import glob
 import gzip
 import os
 import re
@@ -50,7 +51,6 @@
 from sickbeard.exceptions import MultipleShowObjectsException, ex
 from sickbeard import logger, classes
 from sickbeard.common import USER_AGENT, mediaExtensions, XML_NSMAP
-from sickbeard.common import mediaExtensions
 
 from sickbeard import db
 from sickbeard import encodingKludge as ek
@@ -260,6 +260,52 @@ def findCertainTVRageShow(showList, tvrid):
         return results[0]
 
 
+def list_associated_files(file_path, base_name_only=False, filter_ext=""):
+    """
+    For a given file path searches for files with the same name but different extension and returns their absolute paths
+
+    file_path: The file to check for associated files
+    base_name_only: False add extra '.' (conservative search) to file_path minus extension
+    filter_ext: A comma separated string with extensions to include or empty string to include all matches
+    Returns: A list containing all files which are associated to the given file
+    """
+
+    if not file_path:
+        return []
+
+    file_path_list = []
+    base_name = file_path.rpartition('.')[0]
+
+    if not base_name_only:
+        base_name = base_name + '.'
+
+    # don't strip it all and use cwd by accident
+    if not base_name:
+        return []
+
+    # don't confuse glob with chars we didn't mean to use
+    base_name = re.sub(r'[\[\]\*\?]', r'[\g<0>]', base_name)
+
+    if filter_ext:
+        # convert to tuple of extensions to restrict to
+        filter_ext = tuple(x.lower().strip() for x in filter_ext.split(','))
+
+    for associated_file_path in ek.ek(glob.glob, base_name + '*'):
+        # only add associated to list
+        if associated_file_path == file_path:
+            continue
+
+        if ek.ek(os.path.isfile, associated_file_path):
+            if filter_ext:
+                if associated_file_path.lower().endswith(filter_ext):
+                    file_path_list.append(associated_file_path)
+
+            else:
+                file_path_list.append(associated_file_path)
+
+    return file_path_list
+
+
 def makeDir(path):
     if not ek.ek(os.path.isdir, path):
         try:
diff --git a/sickbeard/name_parser/parser.py b/sickbeard/name_parser/parser.py
index 3bfac589fd..1a745fecae 100644
--- a/sickbeard/name_parser/parser.py
+++ b/sickbeard/name_parser/parser.py
@@ -20,14 +20,13 @@
 import os.path
 import re
 
-import regexes
-
 import sickbeard
 
-from sickbeard import logger
 from sickbeard import encodingKludge as ek
 from sickbeard import helpers
-
+from sickbeard import logger
+from sickbeard.exceptions import ex
+from sickbeard.name_parser import regexes
 
 
 class NameParser(object):
@@ -97,11 +96,15 @@ def _parse_string(self, name):
                 result.season_number = tmp_season
 
             if 'ep_num' in named_groups:
-                ep_num = self._convert_number(match.group('ep_num'))
-                if 'extra_ep_num' in named_groups and match.group('extra_ep_num'):
-                    result.episode_numbers = range(ep_num, self._convert_number(match.group('extra_ep_num')) + 1)
-                else:
-                    result.episode_numbers = [ep_num]
+                try:
+                    ep_num = self._convert_number(match.group('ep_num'))
+                    if 'extra_ep_num' in named_groups and match.group('extra_ep_num'):
+                        result.episode_numbers = range(ep_num, self._convert_number(match.group('extra_ep_num')) + 1)
+                    else:
+                        result.episode_numbers = [ep_num]
+
+                except ValueError, e:
+                    raise InvalidNameException(ex(e))
 
             if 'air_year' in named_groups and 'air_month' in named_groups and 'air_day' in named_groups:
                 year = int(match.group('air_year'))
@@ -117,7 +120,7 @@ def _parse_string(self, name):
                 try:
                     result.air_date = datetime.date(year, month, day)
                 except ValueError, e:
-                    raise InvalidNameException(e.message)
+                    raise InvalidNameException(ex(e))
 
             result.is_proper = False
 
@@ -169,38 +172,51 @@ def _unicodify(self, obj, encoding="utf-8"):
                 obj = unicode(obj, encoding)
         return obj
 
-    def _convert_number(self, org_number):
+    def _convert_number(self, number):
         """
-        Convert org_number into an integer
-        org_number: integer or representation of a number: string or unicode
-        Try force converting to int first, on error try converting from Roman numerals
-        returns integer or 0
+        Convert number into an integer. Try force converting into integer first,
+        on error try converting from Roman numerals.
+
+        Args:
+            number: int or representation of a number: string or unicode
+
+        Returns:
+            integer: int number
+
+        Raises:
+            ValueError
         """
 
         try:
             # try forcing to int
-            if org_number:
-                number = int(org_number)
-            else:
-                number = 0
+            integer = int(number)
 
         except:
             # on error try converting from Roman numerals
-            roman_to_int_map = (('M', 1000), ('CM', 900), ('D', 500), ('CD', 400), ('C', 100),
-                                ('XC', 90), ('L', 50), ('XL', 40), ('X', 10),
-                                ('IX', 9), ('V', 5), ('IV', 4), ('I', 1)
-                               )
-
-            roman_numeral = str(org_number).upper()
-            number = 0
+            roman_numeral_map = (
+                                 ('M', 1000, 3),
+                                 ('CM', 900, 1), ('D', 500, 1), ('CD', 400, 1), ('C', 100, 3),
+                                 ('XC', 90, 1), ('L', 50, 1), ('XL', 40, 1), ('X', 10, 3),
+                                 ('IX', 9, 1), ('V', 5, 1), ('IV', 4, 1), ('I', 1, 3)
+                                )
+
+            roman_numeral = str(number).upper()
+            integer = 0
             index = 0
 
-            for numeral, integer in roman_to_int_map:
+            for numeral, value, max_count in roman_numeral_map:
+                count = 0
                 while roman_numeral[index:index + len(numeral)] == numeral:
-                    number += integer
+                    count += 1
+                    if count > max_count:
+                        raise ValueError('not a roman numeral')
+                    integer += value
                     index += len(numeral)
 
-        return number
+            if index < len(roman_numeral):
+                raise ValueError('not a roman numeral')
+
+        return integer
 
     def parse(self, name):
 
@@ -341,7 +357,7 @@ def _is_air_by_date(self):
 
 
 class NameParserCache(object):
-    #TODO: check if the fifo list can beskiped and only use one dict
+    #TODO: check if the fifo list can be skipped and only use one dict
     _previous_parsed_list = []  # keep a fifo list of the cached items
     _previous_parsed = {}
     _cache_size = 100
@@ -355,7 +371,7 @@ def add(self, name, parse_result):
 
     def get(self, name):
         if name in self._previous_parsed:
-            logger.log("Using cached parse result for: " + name, logger.DEBUG)
+            logger.log(u"Using cached parse result for: " + name, logger.DEBUG)
             return self._previous_parsed[name]
         else:
             return None
diff --git a/sickbeard/name_parser/regexes.py b/sickbeard/name_parser/regexes.py
index 21b04e344f..49629bde97 100644
--- a/sickbeard/name_parser/regexes.py
+++ b/sickbeard/name_parser/regexes.py
@@ -23,30 +23,32 @@
                # Show.Name.S01E02.S01E03.Source.Quality.Etc-Group
                # Show Name - S01E02 - S01E03 - S01E04 - Ep Name
                '''
-               ^(?P<series_name>.+?)[. _-]+                # Show_Name and separator
-               s(?P<season_num>\d+)[. _-]*                 # S01 and optional separator
-               e(?P<ep_num>\d+)                            # E02 and separator
-               ([. _-]+s(?P=season_num)[. _-]*             # S01 and optional separator
-               e(?P<extra_ep_num>\d+))+                    # E03/etc and separator
-               [. _-]*((?P<extra_info>.+?)                 # Source_Quality_Etc-
-               ((?<![. _-])(?<!WEB)                        # Make sure this is really the release group
-               -(?P<release_group>[^- ]+))?)?$              # Group
-               '''),
-              
+               ^(?P<series_name>.+?)[. _-]+                  # Show_Name and separator
+               s(?P<season_num>\d+)[. _-]*                   # S01 and optional separator
+               e(?P<ep_num>\d+)                              # E02 and separator
+               ([. _-]+s(?P=season_num)[. _-]*               # S01 and optional separator
+               e(?P<extra_ep_num>\d+))+                      # E03/etc and separator
+               [. _-]*((?P<extra_info>.+?)                   # Source_Quality_Etc-
+               ((?<![. _-])(?<!WEB)                          # Make sure this is really the release group
+               -(?P<release_group>[^- ]+))?)?$               # Group
+               '''
+              ),
+
               ('fov_repeat',
                # Show.Name.1x02.1x03.Source.Quality.Etc-Group
                # Show Name - 1x02 - 1x03 - 1x04 - Ep Name
                '''
-               ^(?P<series_name>.+?)[. _-]+                # Show_Name and separator
-               (?P<season_num>\d+)x                        # 1x
-               (?P<ep_num>\d+)                             # 02 and separator
-               ([. _-]+(?P=season_num)x                    # 1x
-               (?P<extra_ep_num>\d+))+                     # 03/etc and separator
-               [. _-]*((?P<extra_info>.+?)                 # Source_Quality_Etc-
-               ((?<![. _-])(?<!WEB)                        # Make sure this is really the release group
-               -(?P<release_group>[^- ]+))?)?$              # Group
-               '''),
-              
+               ^(?P<series_name>.+?)[. _-]+                  # Show_Name and separator
+               (?P<season_num>\d+)x                          # 1x
+               (?P<ep_num>\d+)                               # 02 and separator
+               ([. _-]+(?P=season_num)x                      # 1x
+               (?P<extra_ep_num>\d+))+                       # 03/etc and separator
+               [. _-]*((?P<extra_info>.+?)                   # Source_Quality_Etc-
+               ((?<![. _-])(?<!WEB)                          # Make sure this is really the release group
+               -(?P<release_group>[^- ]+))?)?$               # Group
+               '''
+              ),
+
               ('standard',
                # Show.Name.S01E02.Source.Quality.Etc-Group
                # Show Name - S01E02 - My Ep Name
@@ -55,15 +57,16 @@
                # Show Name - S01E02-03 - My Ep Name
                # Show.Name.S01.E02.E03
                '''
-               ^((?P<series_name>.+?)[. _-]+)?             # Show_Name and separator
-               s(?P<season_num>\d+)[. _-]*                 # S01 and optional separator
-               e(?P<ep_num>\d+)                            # E02 and separator
-               (([. _-]*e|-)                               # linking e/- char
-               (?P<extra_ep_num>(?!(1080|720)[pi])\d+))*   # additional E03/etc
-               [. _-]*((?P<extra_info>.+?)                 # Source_Quality_Etc-
-               ((?<![. _-])(?<!WEB)                        # Make sure this is really the release group
-               -(?P<release_group>[^- ]+))?)?$              # Group
-               '''),
+               ^((?P<series_name>.+?)[. _-]+)?               # Show_Name and separator
+               s(?P<season_num>\d+)[. _-]*                   # S01 and optional separator
+               e(?P<ep_num>\d+)                              # E02 and separator
+               (([. _-]*e|-)                                 # linking e/- char
+               (?P<extra_ep_num>(?!(1080|720|480)[pi])\d+))* # additional E03/etc
+               [. _-]*((?P<extra_info>.+?)                   # Source_Quality_Etc-
+               ((?<![. _-])(?<!WEB)                          # Make sure this is really the release group
+               -(?P<release_group>[^- ]+))?)?$               # Group
+               '''
+              ),
 
               ('fov',
                # Show_Name.1x02.Source_Quality_Etc-Group
@@ -71,118 +74,121 @@
                # Show_Name.1x02x03x04.Source_Quality_Etc-Group
                # Show Name - 1x02-03-04 - My Ep Name
                '''
-               ^((?P<series_name>.+?)[\[. _-]+)?           # Show_Name and separator
-               (?P<season_num>\d+)x                        # 1x
-               (?P<ep_num>\d+)                             # 02 and separator
-               (([. _-]*x|-)                               # linking x/- char
+               ^((?P<series_name>.+?)[\[. _-]+)?             # Show_Name and separator
+               (?P<season_num>\d+)x                          # 1x
+               (?P<ep_num>\d+)                               # 02 and separator
+               (([. _-]*x|-)                                 # linking x/- char
                (?P<extra_ep_num>
-               (?!(1080|720)[pi])(?!(?<=x)264)             # ignore obviously wrong multi-eps
-               \d+))*                                      # additional x03/etc
-               [\]. _-]*((?P<extra_info>.+?)               # Source_Quality_Etc-
-               ((?<![. _-])(?<!WEB)                        # Make sure this is really the release group
-               -(?P<release_group>[^- ]+))?)?$              # Group
-               '''),
-        
+               (?!(1080|720|480)[pi])(?!(?<=x)264)           # ignore obviously wrong multi-eps
+               \d+))*                                        # additional x03/etc
+               [\]. _-]*((?P<extra_info>.+?)                 # Source_Quality_Etc-
+               ((?<![. _-])(?<!WEB)                          # Make sure this is really the release group
+               -(?P<release_group>[^- ]+))?)?$               # Group
+               '''
+              ),
+
               ('scene_date_format',
                # Show.Name.2010.11.23.Source.Quality.Etc-Group
                # Show Name - 2010-11-23 - Ep Name
                '''
-               ^((?P<series_name>.+?)[. _-]+)?             # Show_Name and separator
-               (?P<air_year>\d{4})[. _-]+                  # 2010 and separator
-               (?P<air_month>\d{2})[. _-]+                 # 11 and separator
-               (?P<air_day>\d{2})                          # 23 and separator
-               [. _-]*((?P<extra_info>.+?)                 # Source_Quality_Etc-
-               ((?<![. _-])(?<!WEB)                        # Make sure this is really the release group
-               -(?P<release_group>[^- ]+))?)?$              # Group
-               '''),
-              
+               ^((?P<series_name>.+?)[. _-]+)?               # Show_Name and separator
+               (?P<air_year>\d{4})[. _-]+                    # 2010 and separator
+               (?P<air_month>\d{2})[. _-]+                   # 11 and separator
+               (?P<air_day>\d{2})                            # 23 and separator
+               [. _-]*((?P<extra_info>.+?)                   # Source_Quality_Etc-
+               ((?<![. _-])(?<!WEB)                          # Make sure this is really the release group
+               -(?P<release_group>[^- ]+))?)?$               # Group
+               '''
+              ),
+
               ('stupid',
                # tpz-abc102
                '''
-               (?P<release_group>.+?)-\w+?[\. ]?           # tpz-abc
-               (?!264)                                     # don't count x264
-               (?P<season_num>\d{1,2})                     # 1
-               (?P<ep_num>\d{2})$                          # 02
-               '''),
-              
+               (?P<release_group>.+?)-\w+?[\. ]?             # tpz-abc
+               (?!264)                                       # don't count x264
+               (?P<season_num>\d{1,2})                       # 1
+               (?P<ep_num>\d{2})$                            # 02
+               '''
+              ),
+
               ('verbose',
                # Show Name Season 1 Episode 2 Ep Name
                '''
-               ^(?P<series_name>.+?)[. _-]+                # Show Name and separator
-               season[. _-]+                               # season and separator
-               (?P<season_num>\d+)[. _-]+                  # 1
-               episode[. _-]+                              # episode and separator
-               (?P<ep_num>\d+)[. _-]+                      # 02 and separator
-               (?P<extra_info>.+)$                         # Source_Quality_Etc-
-               '''),
-              
+               ^(?P<series_name>.+?)[. _-]+                  # Show Name and separator
+               season[. _-]+                                 # season and separator
+               (?P<season_num>\d+)[. _-]+                    # 1
+               episode[. _-]+                                # episode and separator
+               (?P<ep_num>\d+)[. _-]+                        # 02 and separator
+               (?P<extra_info>.+)$                           # Source_Quality_Etc-
+               '''
+              ),
+
               ('season_only',
                # Show.Name.S01.Source.Quality.Etc-Group
                '''
-               ^((?P<series_name>.+?)[. _-]+)?             # Show_Name and separator
-               s(eason[. _-])?                             # S01/Season 01
-               (?P<season_num>\d+)[. _-]*                  # S01 and optional separator
-               [. _-]*((?P<extra_info>.+?)                 # Source_Quality_Etc-
-               ((?<![. _-])(?<!WEB)                        # Make sure this is really the release group
-               -(?P<release_group>[^- ]+))?)?$              # Group
+               ^((?P<series_name>.+?)[. _-]+)?               # Show_Name and separator
+               s(eason[. _-])?                               # S01/Season 01
+               (?P<season_num>\d+)[. _-]*                    # S01 and optional separator
+               [. _-]*((?P<extra_info>.+?)                   # Source_Quality_Etc-
+               ((?<![. _-])(?<!WEB)                          # Make sure this is really the release group
+               -(?P<release_group>[^- ]+))?)?$               # Group
                '''
-               ),
+              ),
 
               ('no_season_multi_ep',
                # Show.Name.E02-03
                # Show.Name.E02.2010
                '''
-               ^((?P<series_name>.+?)[. _-]+)?             # Show_Name and separator
-               (e(p(isode)?)?|part|pt)[. _-]?              # e, ep, episode, or part
-               (?P<ep_num>(\d+|[ivx]+))                    # first ep num
-               ((([. _-]+(and|&|to)[. _-]+)|-)             # and/&/to joiner
-               (?P<extra_ep_num>(?!(1080|720)[pi])(\d+|[ivx]+))[. _-])            # second ep num
-               ([. _-]*(?P<extra_info>.+?)                 # Source_Quality_Etc-
-               ((?<![. _-])(?<!WEB)                        # Make sure this is really the release group
-               -(?P<release_group>[^- ]+))?)?$              # Group
+               ^((?P<series_name>.+?)[. _-]+)?               # Show_Name and separator
+               (e(p(isode)?)?|part|pt)[. _-]?                # e, ep, episode, or part
+               (?P<ep_num>(\d+|[ivx]+))                      # first ep num
+               ((([. _-]+(and|&|to)[. _-]+)|-)               # and/&/to joiner
+               (?P<extra_ep_num>(?!(1080|720|480)[pi])(\d+|[ivx]+))[. _-])            # second ep num
+               ([. _-]*(?P<extra_info>.+?)                   # Source_Quality_Etc-
+               ((?<![. _-])(?<!WEB)                          # Make sure this is really the release group
+               -(?P<release_group>[^- ]+))?)?$               # Group
                '''
-               ),
+              ),
 
               ('no_season_general',
                # Show.Name.E23.Test
                # Show.Name.Part.3.Source.Quality.Etc-Group
                # Show.Name.Part.1.and.Part.2.Blah-Group
                '''
-               ^((?P<series_name>.+?)[. _-]+)?             # Show_Name and separator
-               (e(p(isode)?)?|part|pt)[. _-]?              # e, ep, episode, or part
-               (?P<ep_num>(\d+|([ivx]+(?=[. _-]))))                    # first ep num
-               ([. _-]+((and|&|to)[. _-]+)?                # and/&/to joiner
-               ((e(p(isode)?)?|part|pt)[. _-]?)           # e, ep, episode, or part
-               (?P<extra_ep_num>(?!(1080|720)[pi])
-               (\d+|([ivx]+(?=[. _-]))))[. _-])*            # second ep num
-               ([. _-]*(?P<extra_info>.+?)                 # Source_Quality_Etc-
-               ((?<![. _-])(?<!WEB)                        # Make sure this is really the release group
-               -(?P<release_group>[^- ]+))?)?$              # Group
-               '''
-               ),
+               ^((?P<series_name>.+?)[. _-]+)?               # Show_Name and separator
+               (e(p(isode)?)?|part|pt)[. _-]?                # e, ep, episode, or part
+               (?P<ep_num>(\d+|([ivx]+(?=[. _-]))))          # first ep num
+               ([. _-]+((and|&|to)[. _-]+)?                  # and/&/to joiner
+               ((e(p(isode)?)?|part|pt)[. _-]?)              # e, ep, episode, or part
+               (?P<extra_ep_num>(?!(1080|720|480)[pi])
+               (\d+|([ivx]+(?=[. _-]))))[. _-])*             # second ep num
+               ([. _-]*(?P<extra_info>.+?)                   # Source_Quality_Etc-
+               ((?<![. _-])(?<!WEB)                          # Make sure this is really the release group
+               -(?P<release_group>[^- ]+))?)?$               # Group
+               '''
+              ),
 
               ('bare',
                # Show.Name.102.Source.Quality.Etc-Group
                '''
-               ^(?P<series_name>.+?)[. _-]+                # Show_Name and separator
-               (?P<season_num>\d{1,2})                     # 1
-               (?P<ep_num>\d{2})                           # 02 and separator
+               ^(?P<series_name>.+?)[. _-]+                  # Show_Name and separator
+               (?P<season_num>\d{1,2})                       # 1
+               (?P<ep_num>\d{2})                             # 02 and separator
                ([. _-]+(?P<extra_info>(?!\d{3}[. _-]+)[^-]+) # Source_Quality_Etc-
-               (-(?P<release_group>.+))?)?$                # Group
-               '''),
-              
+               (-(?P<release_group>.+))?)?$                  # Group
+               '''
+              ),
+
               ('no_season',
                # Show Name - 01 - Ep Name
                # 01 - Ep Name
-               # 01 - Ep Name
                '''
-               ^((?P<series_name>.+?)(?:[. _-]{2,}|[. _]))?             # Show_Name and separator
-               (?P<ep_num>\d{1,2})                           # 02
+               ^((?P<series_name>.+?)(?:[. _-]{2,}|[. _]))?  # Show_Name and separator
+               (?P<ep_num>\d{1,2})                           # 01
                (?:-(?P<extra_ep_num>\d{1,2}))*               # 02
-               [. _-]+((?P<extra_info>.+?)                 # Source_Quality_Etc-
-               ((?<![. _-])(?<!WEB)                        # Make sure this is really the release group
-               -(?P<release_group>[^- ]+))?)?$              # Group
+               [. _-]+((?P<extra_info>.+?)                   # Source_Quality_Etc-
+               ((?<![. _-])(?<!WEB)                          # Make sure this is really the release group
+               -(?P<release_group>[^- ]+))?)?$               # Group
                '''
-               ),
-              ]
-
+              ),
+             ]
diff --git a/sickbeard/notifiers/__init__.py b/sickbeard/notifiers/__init__.py
index c65d7c4293..ac806633db 100755
--- a/sickbeard/notifiers/__init__.py
+++ b/sickbeard/notifiers/__init__.py
@@ -29,8 +29,9 @@
 import prowl
 from . import libnotify
 import pushover
-import boxcar
+import boxcar2
 import nma
+import pushalot
 
 import tweet
 import trakt
@@ -51,8 +52,9 @@
 prowl_notifier = prowl.ProwlNotifier()
 libnotify_notifier = libnotify.LibnotifyNotifier()
 pushover_notifier = pushover.PushoverNotifier()
-boxcar_notifier = boxcar.BoxcarNotifier()
+boxcar2_notifier = boxcar2.Boxcar2Notifier()
 nma_notifier = nma.NMA_Notifier()
+pushalot_notifier = pushalot.PushalotNotifier()
 # social
 twitter_notifier = tweet.TwitterNotifier()
 trakt_notifier = trakt.TraktNotifier()
@@ -68,8 +70,9 @@
     growl_notifier,
     prowl_notifier,
     pushover_notifier,
-    boxcar_notifier,
+    boxcar2_notifier,
     nma_notifier,
+    pushalot_notifier,
     twitter_notifier,
     trakt_notifier,
 ]
diff --git a/sickbeard/notifiers/boxcar.py b/sickbeard/notifiers/boxcar.py
deleted file mode 100644
index 315a4f5916..0000000000
--- a/sickbeard/notifiers/boxcar.py
+++ /dev/null
@@ -1,151 +0,0 @@
-# Author: Marvin Pinto <me@marvinp.ca>
-# Author: Dennis Lutter <lad1337@gmail.com>
-# URL: http://code.google.com/p/sickbeard/
-#
-# This file is part of Sick Beard.
-#
-# Sick Beard is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Sick Beard is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
-
-import urllib
-import urllib2
-import time
-
-import sickbeard
-
-from sickbeard import logger
-from sickbeard.common import notifyStrings, NOTIFY_SNATCH, NOTIFY_DOWNLOAD
-from sickbeard.exceptions import ex
-
-API_URL = "https://boxcar.io/devices/providers/fWc4sgSmpcN6JujtBmR6/notifications"
-
-
-class BoxcarNotifier:
-
-    def _sendBoxcar(self, msg, title, email, subscribe=False):
-        """
-        Sends a boxcar notification to the address provided
-
-        msg: The message to send (unicode)
-        title: The title of the message
-        email: The email address to send the message to (or to subscribe with)
-        subscribe: If true then instead of sending a message this function will send a subscription notification (optional, default is False)
-
-        returns: True if the message succeeded, False otherwise
-        """
-
-        # build up the URL and parameters
-        msg = msg.strip()
-        curUrl = API_URL
-
-        # if this is a subscription notification then act accordingly
-        if subscribe:
-            data = urllib.urlencode({'email': email})
-            curUrl = curUrl + "/subscribe"
-
-        # for normal requests we need all these parameters
-        else:
-            data = urllib.urlencode({
-                'email': email,
-                'notification[from_screen_name]': title,
-                'notification[message]': msg.encode('utf-8'),
-                'notification[from_remote_service_id]': int(time.time())
-                })
-
-        # send the request to boxcar
-        try:
-            req = urllib2.Request(curUrl)
-            handle = urllib2.urlopen(req, data)
-            handle.close()
-
-        except urllib2.URLError, e:
-            # if we get an error back that doesn't have an error code then who knows what's really happening
-            if not hasattr(e, 'code'):
-                logger.log(u"BOXCAR: Notification failed." + ex(e), logger.ERROR)
-                return False
-            else:
-                logger.log(u"BOXCAR: Notification failed. Error code: " + str(e.code), logger.ERROR)
-
-            # HTTP status 404 if the provided email address isn't a Boxcar user.
-            if e.code == 404:
-                logger.log(u"BOXCAR: Username is wrong/not a boxcar email. Boxcar will send an email to it", logger.WARNING)
-                return False
-
-            # For HTTP status code 401's, it is because you are passing in either an invalid token, or the user has not added your service.
-            elif e.code == 401:
-
-                # If the user has already added your service, we'll return an HTTP status code of 401.
-                if subscribe:
-                    logger.log(u"BOXCAR: Already subscribed to service", logger.ERROR)
-                    # i dont know if this is true or false ... its neither but i also dont know how we got here in the first place
-                    return False
-
-                # HTTP status 401 if the user doesn't have the service added
-                else:
-                    subscribeNote = self._sendBoxcar(msg, title, email, True)
-                    if subscribeNote:
-                        logger.log(u"BOXCAR: Subscription sent.", logger.DEBUG)
-                        return True
-                    else:
-                        logger.log(u"BOXCAR: Subscription could not be sent.", logger.ERROR)
-                        return False
-
-            # If you receive an HTTP status code of 400, it is because you failed to send the proper parameters
-            elif e.code == 400:
-                logger.log(u"BOXCAR: Wrong data sent to boxcar.", logger.ERROR)
-                return False
-
-        logger.log(u"BOXCAR: Notification successful.", logger.MESSAGE)
-        return True
-
-    def _notify(self, title, message, username=None, force=False):
-        """
-        Sends a boxcar notification based on the provided info or SB config
-
-        title: The title of the notification to send
-        message: The message string to send
-        username: The username to send the notification to (optional, defaults to the username in the config)
-        force: If True then the notification will be sent even if Boxcar is disabled in the config
-        """
-
-        # suppress notifications if the notifier is disabled but the notify options are checked
-        if not sickbeard.USE_BOXCAR and not force:
-            return False
-
-        # if no username was given then use the one from the config
-        if not username:
-            username = sickbeard.BOXCAR_USERNAME
-
-        logger.log(u"BOXCAR: Sending notification for " + message, logger.DEBUG)
-
-        return self._sendBoxcar(message, title, username)
-
-##############################################################################
-# Public functions
-##############################################################################
-
-    def notify_snatch(self, ep_name):
-        if sickbeard.BOXCAR_NOTIFY_ONSNATCH:
-            self._notify(notifyStrings[NOTIFY_SNATCH], ep_name)
-
-    def notify_download(self, ep_name):
-        if sickbeard.BOXCAR_NOTIFY_ONDOWNLOAD:
-            self._notify(notifyStrings[NOTIFY_DOWNLOAD], ep_name)
-
-    def test_notify(self, boxcar_username):
-        return self._notify("This is a test notification from Sick Beard", "Test", boxcar_username, force=True)
-
-    def update_library(self, ep_obj=None):
-        pass
-
-notifier = BoxcarNotifier
diff --git a/sickbeard/notifiers/boxcar2.py b/sickbeard/notifiers/boxcar2.py
new file mode 100644
index 0000000000..6456410a21
--- /dev/null
+++ b/sickbeard/notifiers/boxcar2.py
@@ -0,0 +1,130 @@
+# Author: Marvin Pinto <me@marvinp.ca>
+# Author: Dennis Lutter <lad1337@gmail.com>
+# Author: Shawn Conroyd <mongo527@gmail.com>
+# URL: http://code.google.com/p/sickbeard/
+#
+# This file is part of Sick Beard.
+#
+# Sick Beard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Sick Beard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
+
+import urllib
+import urllib2
+
+import sickbeard
+
+from sickbeard import logger
+from sickbeard.common import notifyStrings, NOTIFY_SNATCH, NOTIFY_DOWNLOAD
+from sickbeard.exceptions import ex
+
+API_URL = "https://new.boxcar.io/api/notifications"
+
+
+class Boxcar2Notifier:
+
+    def _sendBoxcar2(self, title, msg, accessToken, sound):
+        """
+        Sends a boxcar2 notification to the address provided
+
+        msg: The message to send (unicode)
+        title: The title of the message
+        accessToken: The access token to send notification to
+
+        returns: True if the message succeeded, False otherwise
+        """
+
+        # build up the URL and parameters
+        msg = msg.strip().encode('utf-8')
+
+        data = urllib.urlencode({
+            'user_credentials': accessToken,
+            'notification[title]': title + " - " + msg,
+            'notification[long_message]': msg,
+            'notification[sound]': sound,
+            'notification[source_name]': "SickBeard"
+            })
+
+        # send the request to boxcar2
+        try:
+            req = urllib2.Request(API_URL)
+            handle = urllib2.urlopen(req, data)
+            handle.close()
+
+        except urllib2.URLError, e:
+            # FIXME: Python 2.5 hack, it wrongly reports 201 as an error
+            if hasattr(e, 'code') and e.code == 201:
+                logger.log(u"BOXCAR2: Notification successful.", logger.MESSAGE)
+                return True
+
+            # if we get an error back that doesn't have an error code then who knows what's really happening
+            if not hasattr(e, 'code'):
+                logger.log(u"BOXCAR2: Notification failed." + ex(e), logger.ERROR)
+            else:
+                logger.log(u"BOXCAR2: Notification failed. Error code: " + str(e.code), logger.ERROR)
+
+            if e.code == 404:
+                logger.log(u"BOXCAR2: Access token is wrong/not associated to a device.", logger.ERROR)
+            elif e.code == 401:
+                logger.log(u"BOXCAR2: Access token not recognized.", logger.ERROR)
+            elif e.code == 400:
+                logger.log(u"BOXCAR2: Wrong data sent to boxcar.", logger.ERROR)
+            elif e.code == 503:
+                logger.log(u"BOXCAR2: Boxcar server to busy to handle the request at this time.", logger.WARNING)
+            return False
+
+        logger.log(u"BOXCAR2: Notification successful.", logger.MESSAGE)
+        return True
+
+    def _notify(self, title, message, accessToken=None, sound=None, force=False):
+        """
+        Sends a boxcar2 notification based on the provided info or SB config
+
+        title: The title of the notification to send
+        message: The message string to send
+        accessToken: The access token to send the notification to (optional, defaults to the access token in the config)
+        force: If True then the notification will be sent even if Boxcar is disabled in the config
+        """
+
+        # suppress notifications if the notifier is disabled but the notify options are checked
+        if not sickbeard.USE_BOXCAR2 and not force:
+            return False
+
+        # fill in omitted parameters
+        if not accessToken:
+            accessToken = sickbeard.BOXCAR2_ACCESS_TOKEN
+        if not sound:
+            sound = sickbeard.BOXCAR2_SOUND
+
+        logger.log(u"BOXCAR2: Sending notification for " + message, logger.DEBUG)
+
+        return self._sendBoxcar2(title, message, accessToken, sound)
+
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        if sickbeard.BOXCAR2_NOTIFY_ONSNATCH:
+            self._notify(notifyStrings[NOTIFY_SNATCH], ep_name)
+
+    def notify_download(self, ep_name):
+        if sickbeard.BOXCAR2_NOTIFY_ONDOWNLOAD:
+            self._notify(notifyStrings[NOTIFY_DOWNLOAD], ep_name)
+
+    def test_notify(self, accessToken, sound):
+        return self._notify("Test", "This is a test notification from Sick Beard", accessToken, sound, force=True)
+
+    def update_library(self, ep_obj=None):
+        pass
+
+notifier = Boxcar2Notifier
diff --git a/sickbeard/notifiers/growl.py b/sickbeard/notifiers/growl.py
index e2b09b73ba..2dce2e3282 100644
--- a/sickbeard/notifiers/growl.py
+++ b/sickbeard/notifiers/growl.py
@@ -179,7 +179,7 @@ def notify_download(self, ep_name):
     def test_notify(self, host, password):
         result = self._sendRegistration(host, password, "Test")
         if result:
-            return self._notify("Test Growl", "Testing Growl settings from Sick Beard", "Test", host, password, force=True)
+            return self._notify("Test Growl", "This is a test notification from Sick Beard", "Test", host, password, force=True)
         else:
             return result
 
diff --git a/sickbeard/notifiers/libnotify.py b/sickbeard/notifiers/libnotify.py
index 2071c07472..14f8ac168f 100644
--- a/sickbeard/notifiers/libnotify.py
+++ b/sickbeard/notifiers/libnotify.py
@@ -117,7 +117,7 @@ def notify_download(self, ep_name):
             self._notify(common.notifyStrings[common.NOTIFY_DOWNLOAD], ep_name)
 
     def test_notify(self):
-        return self._notify("Test notification", "This is a test notification from Sick Beard", force=True)
+        return self._notify("Test", "This is a test notification from Sick Beard", force=True)
 
     def update_library(self, ep_obj=None):
         pass
diff --git a/sickbeard/notifiers/nma.py b/sickbeard/notifiers/nma.py
index 84c6f73875..67d7f68a4c 100644
--- a/sickbeard/notifiers/nma.py
+++ b/sickbeard/notifiers/nma.py
@@ -24,18 +24,16 @@
 
 class NMA_Notifier:
 
-    def _sendNMA(self, nma_api=None, nma_priority=None, event=None, message=None, force=False):
-
-        title = "Sick Beard"
+    def _notify(self, event, message, nma_api=None, nma_priority=None, force=False):
 
         # suppress notifications if the notifier is disabled but the notify options are checked
         if not sickbeard.USE_NMA and not force:
             return False
 
-        if nma_api == None:
+        # fill in omitted parameters
+        if not nma_api:
             nma_api = sickbeard.NMA_API
-
-        if nma_priority == None:
+        if not nma_priority:
             nma_priority = sickbeard.NMA_PRIORITY
 
         batch = False
@@ -47,8 +45,8 @@ def _sendNMA(self, nma_api=None, nma_priority=None, event=None, message=None, fo
         if len(keys) > 1:
             batch = True
 
-        logger.log("NMA: Sending notice with details: event=\"%s\", message=\"%s\", priority=%s, batch=%s" % (event, message, nma_priority, batch), logger.DEBUG)
-        response = p.push(title, event, message, priority=nma_priority, batch_mode=batch)
+        logger.log(u"NMA: Sending notice with details: event=\"%s\", message=\"%s\", priority=%s, batch=%s" % (event, message, nma_priority, batch), logger.DEBUG)
+        response = p.push("Sick Beard", event, message, priority=nma_priority, batch_mode=batch)
 
         if not response[nma_api][u'code'] == u'200':
             logger.log(u"NMA: Could not send notification to NotifyMyAndroid", logger.ERROR)
@@ -63,14 +61,14 @@ def _sendNMA(self, nma_api=None, nma_priority=None, event=None, message=None, fo
 
     def notify_snatch(self, ep_name):
         if sickbeard.NMA_NOTIFY_ONSNATCH:
-            self._sendNMA(nma_api=None, nma_priority=None, event=common.notifyStrings[common.NOTIFY_SNATCH], message=ep_name)
+            self._notify(common.notifyStrings[common.NOTIFY_SNATCH], ep_name)
 
     def notify_download(self, ep_name):
         if sickbeard.NMA_NOTIFY_ONDOWNLOAD:
-            self._sendNMA(nma_api=None, nma_priority=None, event=common.notifyStrings[common.NOTIFY_DOWNLOAD], message=ep_name)
+            self._notify(common.notifyStrings[common.NOTIFY_DOWNLOAD], ep_name)
 
     def test_notify(self, nma_api, nma_priority):
-        return self._sendNMA(nma_api, nma_priority, event="Test", message="Testing NMA settings from Sick Beard", force=True)
+        return self._notify("Test", "This is a test notification from Sick Beard", nma_api, nma_priority, force=True)
 
     def update_library(self, ep_obj=None):
         pass
diff --git a/sickbeard/notifiers/plex.py b/sickbeard/notifiers/plex.py
index 18d87aa835..4af52e4223 100644
--- a/sickbeard/notifiers/plex.py
+++ b/sickbeard/notifiers/plex.py
@@ -144,7 +144,7 @@ def notify_download(self, ep_name):
             self._notify(ep_name, common.notifyStrings[common.NOTIFY_DOWNLOAD])
 
     def test_notify(self, host, username, password):
-        return self._notify("Testing Plex notifications from Sick Beard", "Test Notification", host, username, password, force=True)
+        return self._notify("This is a test notification from Sick Beard", "Test", host, username, password, force=True)
 
     def update_library(self, ep_obj=None):
         """Handles updating the Plex Media Server host via HTTP API
diff --git a/sickbeard/notifiers/prowl.py b/sickbeard/notifiers/prowl.py
index 30d78ade5a..a30b00d595 100644
--- a/sickbeard/notifiers/prowl.py
+++ b/sickbeard/notifiers/prowl.py
@@ -28,7 +28,7 @@
 
 class ProwlNotifier:
 
-    def _notify(self, prowl_api=None, prowl_priority=None, event=None, message=None, force=False):
+    def _notify(self, event, message, prowl_api=None, prowl_priority=None, force=False):
 
         # suppress notifications if the notifier is disabled but the notify options are checked
         if not sickbeard.USE_PROWL and not force:
@@ -40,8 +40,6 @@ def _notify(self, prowl_api=None, prowl_priority=None, event=None, message=None,
         if not prowl_priority:
             prowl_priority = sickbeard.PROWL_PRIORITY
 
-        title = "Sick Beard"
-
         logger.log("PROWL: Sending notice with details: event=\"%s\", message=\"%s\", priority=%s, api=%s" % (event, message, prowl_priority, prowl_api), logger.DEBUG)
 
         try:
@@ -49,7 +47,7 @@ def _notify(self, prowl_api=None, prowl_priority=None, event=None, message=None,
             http_handler = HTTPSConnection("api.prowlapp.com")
 
             data = {'apikey': prowl_api,
-                    'application': title,
+                    'application': "SickBeard",
                     'event': event,
                     'description': message.encode('utf-8'),
                     'priority': prowl_priority
@@ -74,6 +72,9 @@ def _notify(self, prowl_api=None, prowl_priority=None, event=None, message=None,
         elif request_status == 401:
             logger.log(u"PROWL: Auth failed: %s" % response.reason, logger.ERROR)
             return False
+        elif request_status == 406:
+            logger.log(u"PROWL: Message throttle limit reached.", logger.WARNING)
+            return False
         else:
             logger.log(u"PROWL: Notification failed.", logger.ERROR)
             return False
@@ -84,14 +85,14 @@ def _notify(self, prowl_api=None, prowl_priority=None, event=None, message=None,
 
     def notify_snatch(self, ep_name):
         if sickbeard.PROWL_NOTIFY_ONSNATCH:
-            self._notify(prowl_api=None, prowl_priority=None, event=common.notifyStrings[common.NOTIFY_SNATCH], message=ep_name)
+            self._notify(common.notifyStrings[common.NOTIFY_SNATCH], ep_name)
 
     def notify_download(self, ep_name):
         if sickbeard.PROWL_NOTIFY_ONDOWNLOAD:
-            self._notify(prowl_api=None, prowl_priority=None, event=common.notifyStrings[common.NOTIFY_DOWNLOAD], message=ep_name)
+            self._notify(common.notifyStrings[common.NOTIFY_DOWNLOAD], ep_name)
 
     def test_notify(self, prowl_api, prowl_priority):
-        return self._notify(prowl_api, prowl_priority, event="Test", message="Testing Prowl settings from Sick Beard", force=True)
+        return self._notify("Test", "This is a test notification from Sick Beard", prowl_api, prowl_priority, force=True)
 
     def update_library(self, ep_obj=None):
         pass
diff --git a/sickbeard/notifiers/pushalot.py b/sickbeard/notifiers/pushalot.py
new file mode 100644
index 0000000000..870bf0fe85
--- /dev/null
+++ b/sickbeard/notifiers/pushalot.py
@@ -0,0 +1,103 @@
+# Author: Maciej Olesinski (https://github.com/molesinski/)
+# Based on prowl.py by Nic Wolfe <nic@wolfeden.ca>
+# URL: http://code.google.com/p/sickbeard/
+#
+# This file is part of Sick Beard.
+#
+# Sick Beard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Sick Beard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
+
+from httplib import HTTPSConnection
+from urllib import urlencode
+
+import sickbeard
+
+from sickbeard.exceptions import ex
+from sickbeard import common
+from sickbeard import logger
+
+
+class PushalotNotifier:
+
+    def _notify(self, title, message, pushalot_authorizationtoken=None, force=False):
+
+        # suppress notifications if the notifier is disabled but the notify options are checked
+        if not sickbeard.USE_PUSHALOT and not force:
+            return False
+
+        # fill in omitted parameters
+        if not pushalot_authorizationtoken:
+            pushalot_authorizationtoken = sickbeard.PUSHALOT_AUTHORIZATIONTOKEN
+
+        logger.log("PUSHALOT: Sending notice with details: title=\"%s\", message=\"%s\", authorizationtoken=%s" % (title, message, pushalot_authorizationtoken), logger.DEBUG)
+
+        try:
+
+            http_handler = HTTPSConnection("pushalot.com")
+
+            data = {'AuthorizationToken': pushalot_authorizationtoken,
+                    'Title': title.encode('utf-8'),
+                    'Body': message.encode('utf-8'),
+                    'Source': 'SickBeard'
+                    }
+
+            http_handler.request("POST", "/api/sendmessage",
+                                 headers={'Content-type': "application/x-www-form-urlencoded"},
+                                 body=urlencode(data)
+                                 )
+
+            response = http_handler.getresponse()
+            request_status = response.status
+
+        except Exception, e:
+            logger.log(u"PUSHALOT: Notification failed: " + ex(e), logger.ERROR)
+            return False
+
+        if request_status == 200:
+            logger.log(u"PUSHALOT: Notifications sent.", logger.MESSAGE)
+            return True
+        elif request_status == 400:
+            logger.log(u"PUSHALOT: Auth failed: %s" % response.reason, logger.ERROR)
+            return False
+        elif request_status == 406:
+            logger.log(u"PUSHALOT: Message throttle limit reached.", logger.WARNING)
+            return False
+        elif request_status == 410:
+            logger.log(u"PUSHALOT: The AuthorizationToken is invalid.", logger.ERROR)
+            return False
+        elif request_status == 503:
+            logger.log(u"PUSHALOT: Notification servers are currently overloaded with requests. Try again later.", logger.ERROR)
+            return False
+        else:
+            logger.log(u"PUSHALOT: Notification failed.", logger.ERROR)
+            return False
+
+##############################################################################
+# Public functions
+##############################################################################
+
+    def notify_snatch(self, ep_name):
+        if sickbeard.PUSHALOT_NOTIFY_ONSNATCH:
+            self._notify(common.notifyStrings[common.NOTIFY_SNATCH], ep_name)
+
+    def notify_download(self, ep_name):
+        if sickbeard.PUSHALOT_NOTIFY_ONDOWNLOAD:
+            self._notify(common.notifyStrings[common.NOTIFY_DOWNLOAD], ep_name)
+
+    def test_notify(self, pushalot_authorizationtoken):
+        return self._notify("Test", "This is a test notification from Sick Beard", pushalot_authorizationtoken, force=True)
+
+    def update_library(self, ep_obj=None):
+        pass
+
+notifier = PushalotNotifier
diff --git a/sickbeard/notifiers/pushover.py b/sickbeard/notifiers/pushover.py
index 7ff796f18b..cc437461c7 100644
--- a/sickbeard/notifiers/pushover.py
+++ b/sickbeard/notifiers/pushover.py
@@ -34,7 +34,7 @@
 
 class PushoverNotifier:
 
-    def _sendPushover(self, msg, title, userKey=None):
+    def _sendPushover(self, title, msg, userKey=None):
         """
         Sends a pushover notification to the address provided
 
@@ -50,7 +50,6 @@ def _sendPushover(self, msg, title, userKey=None):
 
         # build up the URL and parameters
         msg = msg.strip()
-        curUrl = API_URL
 
         data = urllib.urlencode({
             'token': API_KEY,
@@ -62,11 +61,16 @@ def _sendPushover(self, msg, title, userKey=None):
 
         # send the request to pushover
         try:
-            req = urllib2.Request(curUrl)
+            req = urllib2.Request(API_URL)
             handle = urllib2.urlopen(req, data)
             handle.close()
 
         except urllib2.URLError, e:
+            # FIXME: Python 2.5 hack, it wrongly reports 201 as an error
+            if hasattr(e, 'code') and e.code == 201:
+                logger.log(u"PUSHOVER: Notification successful.", logger.MESSAGE)
+                return True
+
             # if we get an error back that doesn't have an error code then who knows what's really happening
             if not hasattr(e, 'code'):
                 logger.log(u"PUSHOVER: Notification failed." + ex(e), logger.ERROR)
@@ -82,8 +86,8 @@ def _sendPushover(self, msg, title, userKey=None):
             # For HTTP status code 401's, it is because you are passing in either an invalid token, or the user has not added your service.
             elif e.code == 401:
 
-                #HTTP status 401 if the user doesn't have the service added
-                subscribeNote = self._sendPushover(msg, title, userKey )
+                # HTTP status 401 if the user doesn't have the service added
+                subscribeNote = self._sendPushover(title, msg, userKey)
                 if subscribeNote:
                     logger.log(u"PUSHOVER: Subscription sent", logger.DEBUG)
                     return True
@@ -118,7 +122,7 @@ def _notify(self, title, message, userKey=None, force=False):
 
         logger.log(u"PUSHOVER: Sending notification for " + message, logger.DEBUG)
 
-        return self._sendPushover(message, title)
+        return self._sendPushover(title, message, userKey)
 
 ##############################################################################
 # Public functions
@@ -132,8 +136,8 @@ def notify_download(self, ep_name):
         if sickbeard.PUSHOVER_NOTIFY_ONDOWNLOAD:
             self._notify(notifyStrings[NOTIFY_DOWNLOAD], ep_name)
 
-    def test_notify(self, userKey=None):
-        return self._notify("This is a test notification from Sick Beard", "Test", userKey, force=True)
+    def test_notify(self, userKey):
+        return self._notify("Test", "This is a test notification from Sick Beard", userKey, force=True)
 
     def update_library(self, ep_obj=None):
         pass
diff --git a/sickbeard/notifiers/trakt.py b/sickbeard/notifiers/trakt.py
index 1d51366d17..47474e7e14 100644
--- a/sickbeard/notifiers/trakt.py
+++ b/sickbeard/notifiers/trakt.py
@@ -140,7 +140,7 @@ def update_library(self, ep_obj=None):
                                    } ]
                     }
 
-            if data is not None:
+            if data:
                 self._notifyTrakt(method, None, None, None, data)
 
 notifier = TraktNotifier
diff --git a/sickbeard/notifiers/xbmc.py b/sickbeard/notifiers/xbmc.py
index 21c713803a..c03a02aa15 100644
--- a/sickbeard/notifiers/xbmc.py
+++ b/sickbeard/notifiers/xbmc.py
@@ -444,7 +444,7 @@ def notify_download(self, ep_name):
             self._notify(ep_name, common.notifyStrings[common.NOTIFY_DOWNLOAD])
 
     def test_notify(self, host, username, password):
-        return self._notify("Testing XBMC notifications from Sick Beard", "Test Notification", host, username, password, force=True)
+        return self._notify("This is a test notification from Sick Beard", "Test", host, username, password, force=True)
 
     def update_library(self, ep_obj=None, show_obj=None):
         """Public wrapper for the update library functions to branch the logic for JSON-RPC or legacy HTTP API
diff --git a/sickbeard/nzbget.py b/sickbeard/nzbget.py
index e66308fbb3..cd680e0ca7 100644
--- a/sickbeard/nzbget.py
+++ b/sickbeard/nzbget.py
@@ -129,8 +129,21 @@ def sendNZB(nzb):
                         nzbcontent64 = standard_b64encode(data)
                         nzbget_result = nzbGetRPC.append(nzb_filename, sickbeard.NZBGET_CATEGORY, add_to_top, nzbcontent64)
 
-        # v12+ pass dupekey + dupescore
-        elif nzbget_version >= 12:
+        # v13+ has a new combined append method that accepts both (url and content)
+        elif nzbget_version >= 13:
+            if nzbcontent64:
+                nzbget_result = nzbGetRPC.append(nzb_filename, nzbcontent64, sickbeard.NZBGET_CATEGORY, nzbgetprio, False, False, dupekey, dupescore, "score")
+            else:
+                nzbget_result = nzbGetRPC.append(nzb_filename, nzb.url, sickbeard.NZBGET_CATEGORY, nzbgetprio, False, False, dupekey, dupescore, "score")
+
+            # the return value has changed from boolean to integer (Positive number representing NZBID of the queue item. 0 and negative numbers represent error codes.)
+            if nzbget_result > 0:
+                nzbget_result = True
+            else:
+                nzbget_result = False
+
+        # v12 pass dupekey + dupescore
+        elif nzbget_version == 12:
             if nzbcontent64:
                 nzbget_result = nzbGetRPC.append(nzb_filename, sickbeard.NZBGET_CATEGORY, nzbgetprio, False, nzbcontent64, False, dupekey, dupescore, "score")
             else:
diff --git a/sickbeard/postProcessor.py b/sickbeard/postProcessor.py
index 8ec0368b7a..79b06308b2 100644
--- a/sickbeard/postProcessor.py
+++ b/sickbeard/postProcessor.py
@@ -18,7 +18,6 @@
 
 from __future__ import with_statement
 
-import glob
 import os
 import re
 import subprocess
@@ -140,41 +139,6 @@ def _checkForExistingFile(self, existing_file):
             self._log(u"File " + existing_file + " doesn't exist", logger.DEBUG)
             return PostProcessor.DOESNT_EXIST
 
-    def list_associated_files(self, file_path, base_name_only=False):
-        """
-        For a given file path searches for files with the same name but different extension and returns their absolute paths
-
-        file_path: The file to check for associated files
-        base_name_only: False add extra '.' (conservative search) to file_path minus extension
-        Returns: A list containing all files which are associated to the given file
-        """
-
-        if not file_path:
-            return []
-
-        file_path_list = []
-        base_name = file_path.rpartition('.')[0]
-
-        if not base_name_only:
-            base_name = base_name + '.'
-
-        # don't strip it all and use cwd by accident
-        if not base_name:
-            return []
-
-        # don't confuse glob with chars we didn't mean to use
-        base_name = re.sub(r'[\[\]\*\?]', r'[\g<0>]', base_name)
-
-        for associated_file_path in ek.ek(glob.glob, base_name + '*'):
-            # only add associated to list
-            if associated_file_path == file_path:
-                continue
-
-            if ek.ek(os.path.isfile, associated_file_path):
-                file_path_list.append(associated_file_path)
-
-        return file_path_list
-
     def _delete(self, file_path, associated_files=False):
         """
         Deletes the file and optionally all associated files.
@@ -189,7 +153,7 @@ def _delete(self, file_path, associated_files=False):
         # figure out which files we want to delete
         file_list = [file_path]
         if associated_files:
-            file_list = file_list + self.list_associated_files(file_path, base_name_only=True)
+            file_list = file_list + helpers.list_associated_files(file_path, base_name_only=True)
 
         if not file_list:
             self._log(u"There were no files associated with " + file_path + ", not deleting anything", logger.DEBUG)
@@ -221,7 +185,7 @@ def _combined_file_operation(self, file_path, new_path, new_base_name, associate
 
         file_list = [file_path]
         if associated_files:
-            file_list = file_list + self.list_associated_files(file_path)
+            file_list = file_list + helpers.list_associated_files(file_path, filter_ext=sickbeard.FILTER_ASSOCIATED_FILES)
 
         if not file_list:
             self._log(u"There were no files associated with " + file_path + ", not moving anything", logger.DEBUG)
@@ -433,13 +397,17 @@ def _analyze_name(self, name, file_name=True):
         return to_return
 
     def _finalize(self, parse_result):
+
         self.release_group = parse_result.release_group
 
         # remember whether it's a proper
         self.is_proper = parse_result.is_proper
 
-        # if the result is complete then remember that for later
-        if parse_result.series_name and parse_result.season_number is not None and parse_result.episode_numbers and parse_result.release_group:
+        # if the result is complete then set release name
+        if parse_result.series_name and ((parse_result.season_number is not None and parse_result.episode_numbers)
+                                          or parse_result.air_date
+                                        ) and parse_result.release_group:
+
             if not self.release_name:
                 self.release_name = helpers.remove_extension(ek.ek(os.path.basename, parse_result.original_name))
 
@@ -448,6 +416,7 @@ def _finalize(self, parse_result):
             logger.log(u"Parse result(series_name): " + str(parse_result.series_name), logger.DEBUG)
             logger.log(u"Parse result(season_number): " + str(parse_result.season_number), logger.DEBUG)
             logger.log(u"Parse result(episode_numbers): " + str(parse_result.episode_numbers), logger.DEBUG)
+            logger.log(u" or Parse result(air_date): " + str(parse_result.air_date), logger.DEBUG)
             logger.log(u"Parse result(release_group): " + str(parse_result.release_group), logger.DEBUG)
 
     def _find_info(self):
@@ -524,7 +493,7 @@ def _find_info(self):
                     self._log(u"Don't have a season number, but this show appears to only have 1 season, setting seasonnumber to 1...", logger.DEBUG)
                     season = 1
 
-            if tvdb_id and season and episodes:
+            if tvdb_id and season is not None and episodes:
                 return (tvdb_id, season, episodes, quality)
 
         return (tvdb_id, season, episodes, quality)
@@ -706,8 +675,12 @@ def _safe_replace(self, ep_obj, new_ep_quality):
             self._log(u"Checking size of existing file: " + ep_obj.location, logger.DEBUG)
             existing_file_status = self._checkForExistingFile(ep_obj.location)
 
-            if existing_file_status in (PostProcessor.EXISTS_LARGER, PostProcessor.EXISTS_SAME):
-                self._log(u"File exists and new file is same/smaller, marking it unsafe to replace", logger.DEBUG)
+            if existing_file_status == PostProcessor.EXISTS_LARGER:
+                self._log(u"File exists and new file is smaller, marking it unsafe to replace", logger.DEBUG)
+                return False
+
+            elif existing_file_status == PostProcessor.EXISTS_SAME:
+                self._log(u"File exists and new file is same size, marking it unsafe to replace", logger.DEBUG)
                 return False
 
             elif existing_file_status == PostProcessor.EXISTS_SMALLER:
@@ -754,7 +727,7 @@ def process(self):
         (tvdb_id, season, episodes, quality) = self._find_info()
 
         # if we don't have it then give up
-        if not tvdb_id or season == None or not episodes:
+        if not tvdb_id or season is None or not episodes:
             self._log(u"Not enough information to determine what episode this is", logger.DEBUG)
             self._log(u"Quitting post-processing", logger.DEBUG)
             return False
diff --git a/sickbeard/properFinder.py b/sickbeard/properFinder.py
index 1a8d041908..d1b1899fe6 100644
--- a/sickbeard/properFinder.py
+++ b/sickbeard/properFinder.py
@@ -38,23 +38,12 @@
 
 class ProperFinder():
 
-    def __init__(self):
-        self.updateInterval = datetime.timedelta(hours=1)
-
     def run(self):
 
         if not sickbeard.DOWNLOAD_PROPERS:
             return
 
-        # look for propers every night at 1 AM
-        updateTime = datetime.time(hour=1)
-        hourDiff = datetime.datetime.today().time().hour - updateTime.hour
-
-        # if it's less than an interval after the update time then do an update
-        if hourDiff >= 0 and hourDiff < self.updateInterval.seconds / 3600:
-            logger.log(u"Beginning the search for new propers")
-        else:
-            return
+        logger.log(u"Beginning the search for new propers")
 
         propers = self._getProperList()
 
@@ -222,10 +211,12 @@ def _downloadPropers(self, properList):
             else:
 
                 # make sure that none of the existing history downloads are the same proper we're trying to download
+                clean_proper_name = self._genericName(helpers.remove_non_release_groups(curProper.name))
                 isSame = False
+
                 for curResult in historyResults:
                     # if the result exists in history already we need to skip it
-                    if self._genericName(curResult["resource"]) == self._genericName(curProper.name):
+                    if self._genericName(helpers.remove_non_release_groups(curResult["resource"])) == clean_proper_name:
                         isSame = True
                         break
                 if isSame:
diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py
index c90cec65ed..b9b7da0041 100644
--- a/sickbeard/providers/__init__.py
+++ b/sickbeard/providers/__init__.py
@@ -99,7 +99,7 @@ def makeNewznabProvider(configString):
 
 
 def getDefaultNewznabProviders():
-    return 'Sick Beard Index|http://lolo.sickbeard.com/|0|5030,5040|0!!!NZBs.org|http://nzbs.org/||5030,5040,5070,5090|0!!!Usenet-Crawler|https://www.usenet-crawler.com/||5030,5040|0'
+    return 'Sick Beard Index|http://lolo.sickbeard.com/|0|5030,5040|1!!!NZBs.org|http://nzbs.org/||5030,5040,5070,5090|0!!!Usenet-Crawler|https://www.usenet-crawler.com/||5030,5040|0'
 
 
 def getProviderModule(name):
diff --git a/sickbeard/providers/btn.py b/sickbeard/providers/btn.py
index f6aa53c63c..9d0a65d579 100644
--- a/sickbeard/providers/btn.py
+++ b/sickbeard/providers/btn.py
@@ -118,7 +118,7 @@ def _doSearch(self, search_params, show=None, age=0):
 
             results = []
 
-            for torrentid, torrent_info in found_torrents.iteritems():
+            for torrentid, torrent_info in found_torrents.iteritems():  # @UnusedVariable
                 (title, url) = self._get_title_and_url(torrent_info)
 
                 if title and url:
@@ -197,6 +197,7 @@ def _get_season_search_strings(self, show, season=None):
         search_params = []
 
         name_exceptions = scene_exceptions.get_scene_exceptions(show.tvdbid) + [show.name]
+
         for name in name_exceptions:
 
             current_params = {}
@@ -211,29 +212,32 @@ def _get_season_search_strings(self, show, season=None):
                 # Search by name if we don't have tvdb or tvrage id
                 current_params['series'] = sanitizeSceneName(name)
 
-            if season != None:
+            if season is not None:
                 whole_season_params = current_params.copy()
                 partial_season_params = current_params.copy()
                 # Search for entire seasons: no need to do special things for air by date shows
                 whole_season_params['category'] = 'Season'
                 whole_season_params['name'] = 'Season ' + str(season)
 
-                search_params.append(whole_season_params)
+                if whole_season_params not in search_params:
+                    search_params.append(whole_season_params)
 
                 # Search for episodes in the season
                 partial_season_params['category'] = 'Episode'
 
                 if show.air_by_date:
                     # Search for the year of the air by date show
-                    partial_season_params['name'] = str(season.split('-')[0])
+                    partial_season_params['name'] = str(season.split('-')[0]) + "%"
                 else:
                     # Search for any result which has Sxx in the name
-                    partial_season_params['name'] = 'S%02d' % int(season)
+                    partial_season_params['name'] = "S" + str(season).zfill(2) + "%"
 
-                search_params.append(partial_season_params)
+                if partial_season_params not in search_params:
+                    search_params.append(partial_season_params)
 
             else:
-                search_params.append(current_params)
+                if current_params not in search_params:
+                    search_params.append(current_params)
 
         return search_params
 
diff --git a/sickbeard/providers/omgwtfnzbs.py b/sickbeard/providers/omgwtfnzbs.py
index 3e71d13ca7..c2cdbef160 100644
--- a/sickbeard/providers/omgwtfnzbs.py
+++ b/sickbeard/providers/omgwtfnzbs.py
@@ -145,8 +145,8 @@ def findPropers(self, search_date=None):
 
                     title, url = self._get_title_and_url(item)
                     try:
-                        result_date = datetime.fromtimestamp(item['usenetage'])
-                    except TypeError:
+                        result_date = datetime.fromtimestamp(int(item['usenetage']))
+                    except:
                         result_date = None
 
                     if result_date:
diff --git a/sickbeard/providers/womble.py b/sickbeard/providers/womble.py
index b5ddd14fea..26bf9bea49 100644
--- a/sickbeard/providers/womble.py
+++ b/sickbeard/providers/womble.py
@@ -19,9 +19,15 @@
 import sickbeard
 import generic
 
+from sickbeard import helpers
 from sickbeard import logger
 from sickbeard import tvcache
 
+try:
+    import xml.etree.cElementTree as etree
+except ImportError:
+    import elementtree.ElementTree as etree
+
 
 class WombleProvider(generic.NZBProvider):
 
@@ -42,10 +48,29 @@ def __init__(self, provider):
         self.minTime = 15
 
     def _getRSSData(self):
-        url = self.provider.url + 'rss/?sec=TV-x264&fr=false'
-        logger.log(u"Womble's Index cache update URL: " + url, logger.DEBUG)
-        data = self.provider.getURL(url)
-        return data
+
+        RSS_data = None
+        xml_element_tree = None
+
+        for url in [self.provider.url + 'rss/?sec=tv-sd&fr=false', self.provider.url + 'rss/?sec=tv-hd&fr=false']:
+            logger.log(u"Womble's Index cache update URL: " + url, logger.DEBUG)
+            data = self.provider.getURL(url)
+
+            if data:
+                parsedXML = helpers.parse_xml(data)
+                if parsedXML:
+                    if xml_element_tree is None:
+                        xml_element_tree = parsedXML
+                    else:
+                        items = parsedXML.findall('.//item')
+                        if items:
+                            for item in items:
+                                xml_element_tree.append(item)
+
+        if xml_element_tree is not None:
+            RSS_data = etree.tostring(xml_element_tree)
+
+        return RSS_data
 
     def _checkAuth(self, data):
         return data != 'Invalid Link'
diff --git a/sickbeard/scheduler.py b/sickbeard/scheduler.py
index e7816f9859..1eebef57ac 100644
--- a/sickbeard/scheduler.py
+++ b/sickbeard/scheduler.py
@@ -27,12 +27,13 @@
 
 class Scheduler:
 
-    def __init__(self, action, cycleTime=datetime.timedelta(minutes=10), run_delay=datetime.timedelta(minutes=0), threadName="ScheduledThread", silent=False):
+    def __init__(self, action, cycleTime=datetime.timedelta(minutes=10), run_delay=datetime.timedelta(minutes=0), start_time=None, threadName="ScheduledThread", silent=False):
 
         self.lastRun = datetime.datetime.now() + run_delay - cycleTime
 
         self.action = action
         self.cycleTime = cycleTime
+        self.start_time = start_time
 
         self.thread = None
         self.threadName = threadName
@@ -59,10 +60,24 @@ def runAction(self):
 
         while True:
 
-            currentTime = datetime.datetime.now()
-
-            if currentTime - self.lastRun >= self.cycleTime:
-                self.lastRun = currentTime
+            current_time = datetime.datetime.now()
+            should_run = False
+
+            # check if interval has passed
+            if current_time - self.lastRun >= self.cycleTime:
+                # check if wanting to start around certain time taking interval into account
+                if self.start_time:
+                    hour_diff = current_time.time().hour - self.start_time.hour
+                    if hour_diff >= 0 and hour_diff < self.cycleTime.seconds / 3600:
+                        should_run = True
+                    else:
+                        # set lastRun to only check start_time after another cycleTime
+                        self.lastRun = current_time
+                else:
+                    should_run = True
+
+            if should_run:
+                self.lastRun = current_time
                 try:
                     if not self.silent:
                         logger.log(u"Starting new thread: " + self.threadName, logger.DEBUG)
diff --git a/sickbeard/search.py b/sickbeard/search.py
index abe46eda99..7be0ab2864 100644
--- a/sickbeard/search.py
+++ b/sickbeard/search.py
@@ -17,14 +17,14 @@
 # along with Sick Beard.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import with_statement
-
+import datetime
 import os
 import traceback
 import re
 
 import sickbeard
 
-from common import SNATCHED, Quality, SEASON_RESULT, MULTI_EP_RESULT
+from common import SNATCHED, WANTED, Quality, SEASON_RESULT, MULTI_EP_RESULT
 
 from sickbeard import logger, db, show_name_helpers, exceptions, helpers
 from sickbeard import sab
@@ -393,56 +393,88 @@ def findSeason(show, season):
     anyQualities, bestQualities = Quality.splitQuality(show.quality)
 
     # pick the best season NZB
-    bestSeasonNZB = None
+    BestSeasonResult = None
     if SEASON_RESULT in foundResults:
-        bestSeasonNZB = pickBestResult(foundResults[SEASON_RESULT], show, anyQualities + bestQualities)
+        BestSeasonResult = pickBestResult(foundResults[SEASON_RESULT], show, anyQualities + bestQualities)
 
-    highest_quality_overall = 0
+    highest_wanted_quality_overall = 0
     for cur_season in foundResults:
         for cur_result in foundResults[cur_season]:
-            if cur_result.quality != Quality.UNKNOWN and cur_result.quality > highest_quality_overall:
-                highest_quality_overall = cur_result.quality
-    logger.log(u"The highest quality of any match is " + Quality.qualityStrings[highest_quality_overall], logger.DEBUG)
+            if cur_result.quality != Quality.UNKNOWN and cur_result.quality in anyQualities + bestQualities and cur_result.quality > highest_wanted_quality_overall:
+                highest_wanted_quality_overall = cur_result.quality
+
+    logger.log(u"The highest wanted quality of any match is " + Quality.qualityStrings[highest_wanted_quality_overall], logger.DEBUG)
 
-    # see if every episode is wanted
-    if bestSeasonNZB:
+    # check if complete season pack can be used
+    if BestSeasonResult:
 
         # get the quality of the season nzb
-        seasonQual = Quality.nameQuality(bestSeasonNZB.name)
-        seasonQual = bestSeasonNZB.quality
-        logger.log(u"The quality of the season NZB is " + Quality.qualityStrings[seasonQual], logger.DEBUG)
+        seasonQual = BestSeasonResult.quality
+        logger.log(u"The quality of the season result is " + Quality.qualityStrings[seasonQual], logger.DEBUG)
 
+        # get all episodes in season from db
         myDB = db.DBConnection()
-        allEps = [int(x["episode"]) for x in myDB.select("SELECT episode FROM tv_episodes WHERE showid = ? AND season = ?", [show.tvdbid, season])]
-        logger.log(u"Episode list: " + str(allEps), logger.DEBUG)
-
-        allWanted = True
-        anyWanted = False
-        for curEpNum in allEps:
-            if not show.wantEpisode(season, curEpNum, seasonQual):
-                allWanted = False
+        sql_result = myDB.select("SELECT episode, airdate FROM tv_episodes WHERE showid = ? AND season = ? ORDER BY episode DESC;", [show.tvdbid, season])
+
+        if sql_result:
+            last_airdate = datetime.date.fromordinal(sql_result[0]['airdate'])
+            all_episodes = sorted([int(x['episode']) for x in sql_result])
+
+        else:
+            last_airdate = datetime.date.fromordinal(1)
+            all_episodes = []
+
+        logger.log(u"Episode list: " + str(all_episodes), logger.DEBUG)
+
+        today = datetime.date.today()
+
+        # only use complete season packs if season ended
+        # only use complete season as fallback if season ended > 7 days
+
+        season_ended = False
+        use_season_fallback = False
+
+        if last_airdate == datetime.date.fromordinal(1) or last_airdate > today:
+            logger.log(u"Ignoring " + BestSeasonResult.name + ", airdate of last episode in season: " + str(last_airdate) + " is never or > today", logger.DEBUG)
+
+        elif last_airdate + datetime.timedelta(days=7) <= today:
+            season_ended = True
+            use_season_fallback = True
+
+        elif last_airdate < today:
+            season_ended = True
+            logger.log(u"Ignoring " + BestSeasonResult.name + " as fallback, airdate of last episode in season: " + str(last_airdate) + " is < 7 days", logger.DEBUG)
+
+        # check if all or some episodes of the season are wanted
+        want_all_eps = True
+        want_some_eps = False
+
+        for cur_ep_num in all_episodes:
+            if not show.wantEpisode(season, cur_ep_num, seasonQual):
+                want_all_eps = False
             else:
-                anyWanted = True
+                want_some_eps = True
 
-        # if we need every ep in the season and there's nothing better then just download this and be done with it
-        if allWanted and bestSeasonNZB.quality == highest_quality_overall:
-            logger.log(u"Every ep in this season is needed, downloading the whole NZB " + bestSeasonNZB.name)
+        # if every episode is needed in the season and there's nothing better then just download this and be done with it
+        if season_ended and want_all_eps and BestSeasonResult.quality == highest_wanted_quality_overall:
+            logger.log(u"Every episode in this season is needed, downloading the whole season " + BestSeasonResult.name)
             epObjs = []
-            for curEpNum in allEps:
-                epObjs.append(show.getEpisode(season, curEpNum))
-            bestSeasonNZB.episodes = epObjs
-            return [bestSeasonNZB]
+            for cur_ep_num in all_episodes:
+                epObjs.append(show.getEpisode(season, cur_ep_num))
+            BestSeasonResult.episodes = epObjs
+            return [BestSeasonResult]
 
-        elif not anyWanted:
-            logger.log(u"No eps from this season are wanted at this quality, ignoring the result of " + bestSeasonNZB.name, logger.DEBUG)
+        elif not want_some_eps:
+            logger.log(u"No episodes from this season are wanted at this quality, ignoring the result of " + BestSeasonResult.name, logger.DEBUG)
 
         else:
 
-            if bestSeasonNZB.provider.providerType == GenericProvider.NZB:
-                logger.log(u"Breaking apart the NZB and adding the individual ones to our results", logger.DEBUG)
+            # if not all episodes are wanted try splitting up the complete season pack
+            if BestSeasonResult.provider.providerType == GenericProvider.NZB:
+                logger.log(u"Try breaking apart the NZB and adding the individual ones to our results", logger.DEBUG)
 
-                # if not, break it apart and add them as the lowest priority results
-                individualResults = nzbSplitter.splitResult(bestSeasonNZB)
+                # break it apart and add them as the lowest priority results
+                individualResults = nzbSplitter.splitResult(BestSeasonResult)
 
                 individualResults = filter(lambda x: show_name_helpers.filterBadReleases(x.name) and show_name_helpers.isGoodResult(x.name, show), individualResults)
 
@@ -457,44 +489,50 @@ def findSeason(show, season):
                     else:
                         foundResults[epNum] = [curResult]
 
-            # If this is a torrent all we can do is leech the entire torrent, user will have to select which eps not do download in his torrent client
             else:
 
-                # Season result from BTN must be a full-season torrent, creating multi-ep result for it.
-                logger.log(u"Adding multi-ep result for full-season torrent. Set the episodes you don't want to 'don't download' in your torrent client if desired!")
-                epObjs = []
-                for curEpNum in allEps:
-                    epObjs.append(show.getEpisode(season, curEpNum))
-                bestSeasonNZB.episodes = epObjs
+                # if not all episodes are wanted, splitting up the complete season pack for torrents is not possible
+                # all we can do is leech the entire torrent, user will have to select which episodes not do download in his torrent client
 
-                epNum = MULTI_EP_RESULT
-                if epNum in foundResults:
-                    foundResults[epNum].append(bestSeasonNZB)
-                else:
-                    foundResults[epNum] = [bestSeasonNZB]
+                if use_season_fallback:
+                    # Creating a multi-ep result from a torrent Season result
+                    logger.log(u"Adding multi-ep result for full-season torrent. Set the episodes you don't want to 'don't download' in your torrent client if desired!")
+                    epObjs = []
+
+                    for cur_ep_num in all_episodes:
+                        # only add wanted episodes for comparing/filter later with single results
+                        if show.wantEpisode(season, cur_ep_num, BestSeasonResult.quality):
+                            epObjs.append(show.getEpisode(season, cur_ep_num))
+
+                    BestSeasonResult.episodes = epObjs
+
+                    if MULTI_EP_RESULT in foundResults:
+                        foundResults[MULTI_EP_RESULT].append(BestSeasonResult)
+                    else:
+                        foundResults[MULTI_EP_RESULT] = [BestSeasonResult]
 
     # go through multi-ep results and see if we really want them or not, get rid of the rest
     multiResults = {}
     if MULTI_EP_RESULT in foundResults:
         for multiResult in foundResults[MULTI_EP_RESULT]:
 
-            logger.log(u"Seeing if we want to bother with multi-episode result " + multiResult.name, logger.DEBUG)
+            logger.log(u"Check multi-episode result against single episode results" + multiResult.name, logger.DEBUG)
 
             # see how many of the eps that this result covers aren't covered by single results
-            neededEps = []
-            notNeededEps = []
+            in_single_results = []
+            not_in_single_results = []
             for epObj in multiResult.episodes:
                 epNum = epObj.episode
                 # if we have results for the episode
                 if epNum in foundResults and len(foundResults[epNum]) > 0:
-                    neededEps.append(epNum)
+                    in_single_results.append(epNum)
                 else:
-                    neededEps.append(epNum)
+                    not_in_single_results.append(epNum)
 
-            logger.log(u"Single-ep check result is neededEps: " + str(neededEps) + ", notNeededEps: " + str(notNeededEps), logger.DEBUG)
+            logger.log(u"Multi-episode check result, episodes not in single results: " + str(not_in_single_results) + ", episodes in single results: " + str(in_single_results), logger.DEBUG)
 
-            if not neededEps:
-                logger.log(u"All of these episodes were covered by single nzbs, ignoring this multi-ep result", logger.DEBUG)
+            if not not_in_single_results:
+                logger.log(u"All of these episodes were covered by single episode results, ignoring this multi-episode result", logger.DEBUG)
                 continue
 
             # check if these eps are already covered by another multi-result
diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py
index a00aad8a2f..6ae455bdcb 100644
--- a/sickbeard/search_queue.py
+++ b/sickbeard/search_queue.py
@@ -148,7 +148,7 @@ def _changeMissingEpisodes(self):
         curDate = datetime.date.today().toordinal()
 
         myDB = db.DBConnection()
-        sqlResults = myDB.select("SELECT * FROM tv_episodes WHERE status = ? AND airdate < ?", [common.UNAIRED, curDate])
+        sqlResults = myDB.select("SELECT * FROM tv_episodes WHERE status = ? AND season > 0 AND airdate < ?", [common.UNAIRED, curDate])
 
         for sqlEp in sqlResults:
 
diff --git a/sickbeard/showUpdater.py b/sickbeard/showUpdater.py
index 0e884dd339..e681ba2299 100644
--- a/sickbeard/showUpdater.py
+++ b/sickbeard/showUpdater.py
@@ -31,23 +31,12 @@
 
 class ShowUpdater():
 
-    def __init__(self):
-        self.updateInterval = datetime.timedelta(hours=1)
-
     def run(self, force=False):
 
-        # update at 3 AM
-        run_updater_time = datetime.time(hour=3)
+        logger.log(u"Doing full update on all shows")
 
         update_datetime = datetime.datetime.today()
         update_date = update_datetime.date()
-        hour_diff = update_datetime.time().hour - run_updater_time.hour
-
-        # if it's less than an interval after the update time then do an update (or if we're forcing it)
-        if hour_diff >= 0 and hour_diff < self.updateInterval.seconds / 3600 or force:
-            logger.log(u"Doing full update on all shows")
-        else:
-            return
 
         # clean out cache directory, remove everything > 12 hours old
         if sickbeard.CACHE_DIR:
diff --git a/sickbeard/show_name_helpers.py b/sickbeard/show_name_helpers.py
index 3130cf1720..28cc62c845 100644
--- a/sickbeard/show_name_helpers.py
+++ b/sickbeard/show_name_helpers.py
@@ -30,7 +30,7 @@
 from name_parser.parser import NameParser, InvalidNameException
 
 resultFilters = ["sub(bed|ed|pack|s)", "(dk|fin|heb|kor|nl|nor|nordic|pl|swe)sub(bed|ed|s)?",
-                 "(dir|sample|sub|nfo)fix", "sample", "(dvd)?extras",
+                 "(dir|sample|sub|nfo|proof)fix(es)?", "sample", "(dvd)?extras",
                  "dub(bed)?"]
 
 
diff --git a/sickbeard/show_queue.py b/sickbeard/show_queue.py
index bfbfc84668..da089ab003 100644
--- a/sickbeard/show_queue.py
+++ b/sickbeard/show_queue.py
@@ -98,7 +98,7 @@ def refreshShow(self, show, force=False):
             raise exceptions.CantRefreshException("This show is already being refreshed, not refreshing again.")
 
         if (self.isBeingUpdated(show) or self.isInUpdateQueue(show)) and not force:
-            logger.log(u"A refresh was attempted but there is already an update queued or in progress. Since updates do a refres at the end anyway I'm skipping this request.", logger.DEBUG)
+            logger.log(u"A refresh was attempted but there is already an update queued or in progress. Since updates do a refresh at the end anyway I'm skipping this request.", logger.DEBUG)
             return
 
         queueItemObj = QueueItemRefresh(show)
@@ -116,6 +116,7 @@ def renameShowEpisodes(self, show, force=False):
         return queueItemObj
 
     def addShow(self, tvdb_id, showDir, default_status=None, quality=None, flatten_folders=None, lang="en"):
+
         queueItemObj = QueueItemAdd(tvdb_id, showDir, default_status, quality, flatten_folders, lang)
 
         self.add_item(queueItemObj)
@@ -131,11 +132,11 @@ class ShowQueueActions:
     RENAME = 5
 
     names = {REFRESH: 'Refresh',
-                    ADD: 'Add',
-                    UPDATE: 'Update',
-                    FORCEUPDATE: 'Force Update',
-                    RENAME: 'Rename',
-                    }
+             ADD: 'Add',
+             UPDATE: 'Update',
+             FORCEUPDATE: 'Force Update',
+             RENAME: 'Rename',
+             }
 
 
 class ShowQueueItem(generic_queue.QueueItem):
@@ -153,7 +154,7 @@ def __init__(self, action_id, show):
         self.show = show
 
     def isInQueue(self):
-        return self in sickbeard.showQueueScheduler.action.queue + [sickbeard.showQueueScheduler.action.currentItem] #@UndefinedVariable
+        return self in sickbeard.showQueueScheduler.action.queue + [sickbeard.showQueueScheduler.action.currentItem]  # @UndefinedVariable
 
     def _getName(self):
         return str(self.show.tvdbid)
@@ -316,12 +317,12 @@ def execute(self):
         if self.default_status != SKIPPED:
             logger.log(u"Setting all episodes to the specified default status: " + str(self.default_status))
             myDB = db.DBConnection()
-            myDB.action("UPDATE tv_episodes SET status = ? WHERE status = ? AND showid = ? AND season != 0", [self.default_status, SKIPPED, self.show.tvdbid])
+            myDB.action("UPDATE tv_episodes SET status = ? WHERE status = ? AND showid = ? AND season > 0", [self.default_status, SKIPPED, self.show.tvdbid])
 
         # if they started with WANTED eps then run the backlog
         if self.default_status == WANTED:
             logger.log(u"Launching backlog for this show since its episodes are WANTED")
-            sickbeard.backlogSearchScheduler.action.searchBacklog([self.show]) #@UndefinedVariable
+            sickbeard.backlogSearchScheduler.action.searchBacklog([self.show])  # @UndefinedVariable
 
         self.show.writeMetadata()
         self.show.populateCache()
@@ -368,7 +369,7 @@ def execute(self):
         logger.log(u"Performing rename on " + self.show.name)
 
         try:
-            show_loc = self.show.location
+            show_loc = self.show.location  # @UnusedVariable
         except exceptions.ShowDirNotFoundException:
             logger.log(u"Can't perform rename on " + self.show.name + " when the show dir is missing.", logger.WARNING)
             return
@@ -463,7 +464,7 @@ def execute(self):
             if self.show.tvrid == 0:
                 self.show.setTVRID()
 
-        sickbeard.showQueueScheduler.action.refreshShow(self.show, True) #@UndefinedVariable
+        sickbeard.showQueueScheduler.action.refreshShow(self.show, True)  # @UndefinedVariable
 
 
 class QueueItemForceUpdate(QueueItemUpdate):
diff --git a/sickbeard/tv.py b/sickbeard/tv.py
index ac785f7a02..8dea82def5 100644
--- a/sickbeard/tv.py
+++ b/sickbeard/tv.py
@@ -37,7 +37,6 @@
 from sickbeard.exceptions import ex
 from sickbeard import tvrage
 from sickbeard import image_cache
-from sickbeard import postProcessor
 
 from sickbeard import encodingKludge as ek
 
@@ -1169,20 +1168,21 @@ def loadFromTVDB(self, season=None, episode=None, cache=True, tvapi=None, cached
         #early conversion to int so that episode doesn't get marked dirty
         self.tvdbid = int(myEp["id"])
 
-        #don't update show status if show dir is missing, unless missing show dirs are created during post-processing
-        if not ek.ek(os.path.isdir, self.show._location) and not sickbeard.CREATE_MISSING_SHOW_DIRS:
+        # don't update show status if show dir is missing, unless it's missing on purpose
+        if not ek.ek(os.path.isdir, self.show._location) and not sickbeard.CREATE_MISSING_SHOW_DIRS and not sickbeard.ADD_SHOWS_WO_DIR:
             logger.log(u"The show dir is missing, not bothering to change the episode statuses since it'd probably be invalid")
             return
 
         logger.log(str(self.show.tvdbid) + u": Setting status for " + str(season) + "x" + str(episode) + " based on status " + str(self.status) + " and existence of " + self.location, logger.DEBUG)
 
+        # if we don't have the file
         if not ek.ek(os.path.isfile, self.location):
 
-            # if we don't have the file
-            if self.airdate >= datetime.date.today() and self.status not in Quality.SNATCHED + Quality.SNATCHED_PROPER:
-                # and it hasn't aired yet set the status to UNAIRED
-                logger.log(u"Episode airs in the future, changing status from " + str(self.status) + " to " + str(UNAIRED), logger.DEBUG)
+            # if it hasn't aired yet set the status to UNAIRED
+            if self.airdate >= datetime.date.today() and self.status in [SKIPPED, UNAIRED, UNKNOWN, WANTED]:
+                logger.log(u"Episode airs in the future, marking it " + str(UNAIRED), logger.DEBUG)
                 self.status = UNAIRED
+
             # if there's no airdate then set it to skipped (and respect ignored)
             elif self.airdate == datetime.date.fromordinal(1):
                 if self.status == IGNORED:
@@ -1190,10 +1190,15 @@ def loadFromTVDB(self, season=None, episode=None, cache=True, tvapi=None, cached
                 else:
                     logger.log(u"Episode has no air date, automatically marking it skipped", logger.DEBUG)
                     self.status = SKIPPED
+
             # if we don't have the file and the airdate is in the past
             else:
                 if self.status == UNAIRED:
-                    self.status = WANTED
+                    if self.season > 0:
+                        self.status = WANTED
+                    else:
+                        # if it's a special then just skip it
+                        self.status = SKIPPED
 
                 # if we somehow are still UNKNOWN then just skip it
                 elif self.status == UNKNOWN:
@@ -1719,7 +1724,7 @@ def rename(self):
             logger.log(str(self.tvdbid) + u": File " + self.location + " is already named correctly, skipping", logger.DEBUG)
             return
 
-        related_files = postProcessor.PostProcessor(self.location).list_associated_files(self.location, base_name_only=True)
+        related_files = helpers.list_associated_files(self.location, base_name_only=True)
         logger.log(u"Files associated to " + self.location + ": " + str(related_files), logger.DEBUG)
 
         # move the ep file
diff --git a/sickbeard/webapi.py b/sickbeard/webapi.py
index 6ab7b269c8..697306d7e6 100644
--- a/sickbeard/webapi.py
+++ b/sickbeard/webapi.py
@@ -733,14 +733,14 @@ def run(self):
         qualList = Quality.DOWNLOADED + Quality.SNATCHED + [ARCHIVED, IGNORED]
 
         myDB = db.DBConnection(row_type="dict")
-        sql_results = myDB.select("SELECT airdate, airs, episode, name AS 'ep_name', description AS 'ep_plot', network, season, showid AS 'tvdbid', show_name, tv_shows.quality AS quality, tv_shows.status AS 'show_status', tv_shows.paused AS 'paused' FROM tv_episodes, tv_shows WHERE season != 0 AND airdate >= ? AND airdate < ? AND tv_shows.tvdb_id = tv_episodes.showid AND tv_episodes.status NOT IN (" + ','.join(['?'] * len(qualList)) + ")", [today, next_week] + qualList)
+        sql_results = myDB.select("SELECT airdate, airs, episode, name AS 'ep_name', description AS 'ep_plot', network, season, showid AS 'tvdbid', show_name, tv_shows.quality AS quality, tv_shows.status AS 'show_status', tv_shows.paused AS 'paused' FROM tv_episodes, tv_shows WHERE season > 0 AND airdate >= ? AND airdate < ? AND tv_shows.tvdb_id = tv_episodes.showid AND tv_episodes.status NOT IN (" + ','.join(['?'] * len(qualList)) + ")", [today, next_week] + qualList)
         for cur_result in sql_results:
             done_show_list.append(int(cur_result["tvdbid"]))
 
-        more_sql_results = myDB.select("SELECT airdate, airs, episode, name AS 'ep_name', description AS 'ep_plot', network, season, showid AS 'tvdbid', show_name, tv_shows.quality AS quality, tv_shows.status AS 'show_status', tv_shows.paused AS 'paused' FROM tv_episodes outer_eps, tv_shows WHERE season != 0 AND showid NOT IN (" + ','.join(['?'] * len(done_show_list)) + ") AND tv_shows.tvdb_id = outer_eps.showid AND airdate = (SELECT airdate FROM tv_episodes inner_eps WHERE inner_eps.season != 0 AND inner_eps.showid = outer_eps.showid AND inner_eps.airdate >= ? ORDER BY inner_eps.airdate ASC LIMIT 1) AND outer_eps.status NOT IN (" + ','.join(['?'] * len(Quality.DOWNLOADED + Quality.SNATCHED)) + ")", done_show_list + [next_week] + Quality.DOWNLOADED + Quality.SNATCHED)
+        more_sql_results = myDB.select("SELECT airdate, airs, episode, name AS 'ep_name', description AS 'ep_plot', network, season, showid AS 'tvdbid', show_name, tv_shows.quality AS quality, tv_shows.status AS 'show_status', tv_shows.paused AS 'paused' FROM tv_episodes outer_eps, tv_shows WHERE season > 0 AND showid NOT IN (" + ','.join(['?'] * len(done_show_list)) + ") AND tv_shows.tvdb_id = outer_eps.showid AND airdate = (SELECT airdate FROM tv_episodes inner_eps WHERE inner_eps.season > 0 AND inner_eps.showid = outer_eps.showid AND inner_eps.airdate >= ? ORDER BY inner_eps.airdate ASC LIMIT 1) AND outer_eps.status NOT IN (" + ','.join(['?'] * len(Quality.DOWNLOADED + Quality.SNATCHED)) + ")", done_show_list + [next_week] + Quality.DOWNLOADED + Quality.SNATCHED)
         sql_results += more_sql_results
 
-        more_sql_results = myDB.select("SELECT airdate, airs, episode, name AS 'ep_name', description AS 'ep_plot', network, season, showid AS 'tvdbid', show_name, tv_shows.quality AS quality, tv_shows.status AS 'show_status', tv_shows.paused AS 'paused' FROM tv_episodes, tv_shows WHERE season != 0 AND tv_shows.tvdb_id = tv_episodes.showid AND airdate < ? AND airdate >= ? AND tv_episodes.status = ? AND tv_episodes.status NOT IN (" + ','.join(['?'] * len(qualList)) + ")", [today, recently, WANTED] + qualList)
+        more_sql_results = myDB.select("SELECT airdate, airs, episode, name AS 'ep_name', description AS 'ep_plot', network, season, showid AS 'tvdbid', show_name, tv_shows.quality AS quality, tv_shows.status AS 'show_status', tv_shows.paused AS 'paused' FROM tv_episodes, tv_shows WHERE season > 0 AND tv_shows.tvdb_id = tv_episodes.showid AND airdate < ? AND airdate >= ? AND tv_episodes.status = ? AND tv_episodes.status NOT IN (" + ','.join(['?'] * len(qualList)) + ")", [today, recently, WANTED] + qualList)
         sql_results += more_sql_results
 
         # sort by air date
@@ -2269,7 +2269,7 @@ def run(self):
             episode_qualities_counts_snatch[statusCode] = 0
 
         myDB = db.DBConnection(row_type="dict")
-        sqlResults = myDB.select("SELECT status, season FROM tv_episodes WHERE season != 0 AND showid = ?", [self.tvdbid])
+        sqlResults = myDB.select("SELECT status, season, airdate FROM tv_episodes WHERE season > 0 AND episode > 0 AND showid = ?", [self.tvdbid])
         # the main loop that goes through all episodes
         for row in sqlResults:
             status, quality = Quality.splitCompositeStatus(int(row["status"]))
@@ -2283,8 +2283,8 @@ def run(self):
                 episode_qualities_counts_snatch["total"] += 1
                 episode_qualities_counts_snatch[int(row["status"])] += 1
             # we dont count NONE = 0 = N/A
-            elif status == 0:
-                pass
+            elif status == 0 or row["airdate"] == 1:
+                episode_status_counts_total["total"] -= 1
             else:
                 episode_status_counts_total[status] += 1
 
@@ -2297,22 +2297,23 @@ def run(self):
                 episodes_stats["downloaded"]["total"] = episode_qualities_counts_download[statusCode]
                 continue
             status, quality = Quality.splitCompositeStatus(int(statusCode))
-            statusString = Quality.qualityStrings[quality].lower().replace(" ", "_").replace("(", "").replace(")", "")
-            episodes_stats["downloaded"][statusString] = episode_qualities_counts_download[statusCode]
+            quality_string = Quality.qualityStrings[quality].lower().replace(" ", "_").replace("(", "").replace(")", "")
+            episodes_stats["downloaded"][quality_string] = episode_qualities_counts_download[statusCode]
 
         episodes_stats["snatched"] = {}
-        # truning codes into strings
-        # and combining proper and normal
+        # turning codes into strings
         for statusCode in episode_qualities_counts_snatch:
             if statusCode is "total":
                 episodes_stats["snatched"]["total"] = episode_qualities_counts_snatch[statusCode]
                 continue
             status, quality = Quality.splitCompositeStatus(int(statusCode))
-            statusString = Quality.qualityStrings[quality].lower().replace(" ", "_").replace("(", "").replace(")", "")
-            if Quality.qualityStrings[quality] in episodes_stats["snatched"]:
-                episodes_stats["snatched"][statusString] += episode_qualities_counts_snatch[statusCode]
+            quality_string = Quality.qualityStrings[quality].lower().replace(" ", "_").replace("(", "").replace(")", "")
+
+            # count qualities for snatched and snatched_proper
+            if quality_string in episodes_stats["snatched"]:
+                episodes_stats["snatched"][quality_string] += episode_qualities_counts_snatch[statusCode]
             else:
-                episodes_stats["snatched"][statusString] = episode_qualities_counts_snatch[statusCode]
+                episodes_stats["snatched"][quality_string] = episode_qualities_counts_snatch[statusCode]
 
         #episodes_stats["total"] = {}
         for statusCode in episode_status_counts_total:
@@ -2418,10 +2419,33 @@ def run(self):
 
         myDB = db.DBConnection()
         today = str(datetime.date.today().toordinal())
+        status_quality = '(' + ','.join([str(quality) for quality in Quality.SNATCHED + Quality.SNATCHED_PROPER]) + ')'
+        status_download = '(' + ','.join([str(quality) for quality in Quality.DOWNLOADED + [ARCHIVED]]) + ')'
+
+        sql_statement = 'SELECT '
+
+        sql_statement += '(SELECT COUNT(*) FROM tv_episodes WHERE season > 0 AND episode > 0 AND status IN ' + status_quality + ') AS ep_snatched, '
+        sql_statement += '(SELECT COUNT(*) FROM tv_episodes WHERE season > 0 AND episode > 0 AND status IN ' + status_download + ') AS ep_downloaded, '
+
+        sql_statement += '(SELECT COUNT(*) FROM tv_episodes WHERE season > 0 AND episode > 0 '
+        sql_statement += ' AND ((airdate > 1 AND airdate <= ' + today + ' AND (status = ' + str(SKIPPED) + ' OR status = ' + str(WANTED) + ')) '
+        sql_statement += ' OR (status IN ' + status_quality + ') OR (status IN ' + status_download + '))) AS ep_total '
+
+        sql_statement += ' FROM tv_episodes tv_eps LIMIT 1'
+
+        sql_result = myDB.select(sql_statement)
+
         stats["shows_total"] = len(sickbeard.showList)
         stats["shows_active"] = len([show for show in sickbeard.showList if show.paused == 0 and show.status != "Ended"])
-        stats["ep_downloaded"] = myDB.select("SELECT COUNT(*) FROM tv_episodes WHERE status IN (" + ",".join([str(show) for show in Quality.DOWNLOADED + [ARCHIVED]]) + ") AND season != 0 and episode != 0 AND airdate <= " + today + "")[0][0]
-        stats["ep_total"] = myDB.select("SELECT COUNT(*) FROM tv_episodes WHERE season != 0 AND episode != 0 AND (airdate != 1 OR status IN (" + ",".join([str(show) for show in (Quality.DOWNLOADED + Quality.SNATCHED + Quality.SNATCHED_PROPER) + [ARCHIVED]]) + ")) AND airdate <= " + today + " AND status != " + str(IGNORED) + "")[0][0]
+
+        if sql_result:
+            stats["ep_snatched"] = sql_result[0]['ep_snatched']
+            stats["ep_downloaded"] = sql_result[0]['ep_downloaded']
+            stats["ep_total"] = sql_result[0]['ep_total']
+        else:
+            stats["ep_snatched"] = 0
+            stats["ep_downloaded"] = 0
+            stats["ep_total"] = 0
 
         myDB.connection.close()
         return _responds(RESULT_SUCCESS, stats)
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index ef640944da..8b3986cd96 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -218,7 +218,7 @@ def showEpisodeStatuses(self, tvdb_id, whichStatus):
         if status_list[0] == SNATCHED:
             status_list = Quality.SNATCHED + Quality.SNATCHED_PROPER
 
-        cur_show_results = myDB.select("SELECT season, episode, name FROM tv_episodes WHERE showid = ? AND season != 0 AND status IN (" + ','.join(['?'] * len(status_list)) + ")", [int(tvdb_id)] + status_list)
+        cur_show_results = myDB.select("SELECT season, episode, name FROM tv_episodes WHERE showid = ? AND season > 0 AND status IN (" + ','.join(['?'] * len(status_list)) + ")", [int(tvdb_id)] + status_list)
 
         result = {}
         for cur_result in cur_show_results:
@@ -252,7 +252,7 @@ def episodeStatuses(self, whichStatus=None):
             return _munge(t)
 
         myDB = db.DBConnection()
-        status_results = myDB.select("SELECT show_name, tv_shows.tvdb_id as tvdb_id FROM tv_episodes, tv_shows WHERE tv_episodes.status IN (" + ','.join(['?'] * len(status_list)) + ") AND season != 0 AND tv_episodes.showid = tv_shows.tvdb_id ORDER BY show_name", status_list)
+        status_results = myDB.select("SELECT show_name, tv_shows.tvdb_id as tvdb_id FROM tv_episodes, tv_shows WHERE tv_episodes.status IN (" + ','.join(['?'] * len(status_list)) + ") AND season > 0 AND tv_episodes.showid = tv_shows.tvdb_id ORDER BY show_name", status_list)
 
         ep_counts = {}
         show_names = {}
@@ -301,7 +301,7 @@ def changeEpisodeStatuses(self, oldStatus, newStatus, *args, **kwargs):
 
             # get a list of all the eps we want to change if they just said "all"
             if 'all' in to_change[cur_tvdb_id]:
-                all_eps_results = myDB.select("SELECT season, episode FROM tv_episodes WHERE status IN (" + ','.join(['?'] * len(status_list)) + ") AND season != 0 AND showid = ?", status_list + [cur_tvdb_id])
+                all_eps_results = myDB.select("SELECT season, episode FROM tv_episodes WHERE status IN (" + ','.join(['?'] * len(status_list)) + ") AND season > 0 AND showid = ?", status_list + [cur_tvdb_id])
                 all_eps = [str(x["season"]) + 'x' + str(x["episode"]) for x in all_eps_results]
                 to_change[cur_tvdb_id] = all_eps
 
@@ -799,7 +799,7 @@ def index(self):
     def savePostProcessing(self, naming_pattern=None, naming_multi_ep=None,
                     xbmc_data=None, xbmc_12plus_data=None, mediabrowser_data=None, sony_ps3_data=None, wdtv_data=None, tivo_data=None, mede8er_data=None,
                     keep_processed_dir=None, process_automatically=None, rename_episodes=None,
-                    move_associated_files=None, tv_download_dir=None, naming_custom_abd=None, naming_abd_pattern=None):
+                    move_associated_files=None, filter_associated_files=None, tv_download_dir=None, naming_custom_abd=None, naming_abd_pattern=None):
 
         results = []
 
@@ -809,6 +809,7 @@ def savePostProcessing(self, naming_pattern=None, naming_multi_ep=None,
 
         sickbeard.KEEP_PROCESSED_DIR = config.checkbox_to_value(keep_processed_dir)
         sickbeard.MOVE_ASSOCIATED_FILES = config.checkbox_to_value(move_associated_files)
+        sickbeard.FILTER_ASSOCIATED_FILES = filter_associated_files
         sickbeard.RENAME_EPISODES = config.checkbox_to_value(rename_episodes)
 
         sickbeard.PROCESS_AUTOMATICALLY = config.checkbox_to_value(process_automatically)
@@ -1092,7 +1093,7 @@ def saveNotifications(self,
                           use_growl=None, growl_notify_onsnatch=None, growl_notify_ondownload=None, growl_host=None, growl_password=None,
                           use_prowl=None, prowl_notify_onsnatch=None, prowl_notify_ondownload=None, prowl_api=None, prowl_priority=0,
                           use_twitter=None, twitter_notify_onsnatch=None, twitter_notify_ondownload=None,
-                          use_boxcar=None, boxcar_notify_onsnatch=None, boxcar_notify_ondownload=None, boxcar_username=None,
+                          use_boxcar2=None, boxcar2_notify_onsnatch=None, boxcar2_notify_ondownload=None, boxcar2_access_token=None, boxcar2_sound=None,
                           use_pushover=None, pushover_notify_onsnatch=None, pushover_notify_ondownload=None, pushover_userkey=None,
                           use_libnotify=None, libnotify_notify_onsnatch=None, libnotify_notify_ondownload=None,
                           use_nmj=None, nmj_host=None, nmj_database=None, nmj_mount=None,
@@ -1101,7 +1102,8 @@ def saveNotifications(self,
                           use_trakt=None, trakt_username=None, trakt_password=None, trakt_api=None,
                           use_pytivo=None, pytivo_notify_onsnatch=None, pytivo_notify_ondownload=None, pytivo_update_library=None,
                               pytivo_host=None, pytivo_share_name=None, pytivo_tivo_name=None,
-                          use_nma=None, nma_notify_onsnatch=None, nma_notify_ondownload=None, nma_api=None, nma_priority=0):
+                          use_nma=None, nma_notify_onsnatch=None, nma_notify_ondownload=None, nma_api=None, nma_priority=0,
+                          use_pushalot=None, pushalot_notify_onsnatch=None, pushalot_notify_ondownload=None, pushalot_authorizationtoken=None):
 
         results = []
 
@@ -1171,10 +1173,11 @@ def saveNotifications(self,
         sickbeard.PUSHOVER_NOTIFY_ONDOWNLOAD = config.checkbox_to_value(pushover_notify_ondownload)
         sickbeard.PUSHOVER_USERKEY = pushover_userkey
 
-        sickbeard.USE_BOXCAR = config.checkbox_to_value(use_boxcar)
-        sickbeard.BOXCAR_NOTIFY_ONSNATCH = config.checkbox_to_value(boxcar_notify_onsnatch)
-        sickbeard.BOXCAR_NOTIFY_ONDOWNLOAD = config.checkbox_to_value(boxcar_notify_ondownload)
-        sickbeard.BOXCAR_USERNAME = boxcar_username
+        sickbeard.USE_BOXCAR2 = config.checkbox_to_value(use_boxcar2)
+        sickbeard.BOXCAR2_NOTIFY_ONSNATCH = config.checkbox_to_value(boxcar2_notify_onsnatch)
+        sickbeard.BOXCAR2_NOTIFY_ONDOWNLOAD = config.checkbox_to_value(boxcar2_notify_ondownload)
+        sickbeard.BOXCAR2_ACCESS_TOKEN = boxcar2_access_token
+        sickbeard.BOXCAR2_SOUND = boxcar2_sound
 
         sickbeard.USE_NMA = config.checkbox_to_value(use_nma)
         sickbeard.NMA_NOTIFY_ONSNATCH = config.checkbox_to_value(nma_notify_onsnatch)
@@ -1182,6 +1185,11 @@ def saveNotifications(self,
         sickbeard.NMA_API = nma_api
         sickbeard.NMA_PRIORITY = nma_priority
 
+        sickbeard.USE_PUSHALOT = config.checkbox_to_value(use_pushalot)
+        sickbeard.PUSHALOT_NOTIFY_ONSNATCH = config.checkbox_to_value(pushalot_notify_onsnatch)
+        sickbeard.PUSHALOT_NOTIFY_ONDOWNLOAD = config.checkbox_to_value(pushalot_notify_ondownload)
+        sickbeard.PUSHALOT_AUTHORIZATIONTOKEN = pushalot_authorizationtoken
+
         # Online
         sickbeard.USE_TWITTER = config.checkbox_to_value(use_twitter)
         sickbeard.TWITTER_NOTIFY_ONSNATCH = config.checkbox_to_value(twitter_notify_onsnatch)
@@ -1876,14 +1884,14 @@ def testProwl(self, prowl_api=None, prowl_priority=0):
             return "Test prowl notice failed"
 
     @cherrypy.expose
-    def testBoxcar(self, username=None):
+    def testBoxcar2(self, accessToken=None, sound=None):
         cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
 
-        result = notifiers.boxcar_notifier.test_notify(username)
+        result = notifiers.boxcar2_notifier.test_notify(accessToken, sound)
         if result:
-            return "Boxcar notification succeeded. Check your Boxcar clients to make sure it worked"
+            return "Boxcar2 notification succeeded. Check your Boxcar2 clients to make sure it worked"
         else:
-            return "Error sending Boxcar notification"
+            return "Error sending Boxcar2 notification"
 
     @cherrypy.expose
     def testPushover(self, userKey=None):
@@ -2029,6 +2037,16 @@ def testNMA(self, nma_api=None, nma_priority=0):
         else:
             return "Test NMA notice failed"
 
+    @cherrypy.expose
+    def testPushalot(self, authorizationtoken=None):
+        cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
+
+        result = notifiers.pushalot_notifier.test_notify(authorizationtoken)
+        if result:
+            return "Pushalot notification succeeded. Check your Pushalot clients to make sure it worked"
+        else:
+            return "Error sending Pushalot notification"
+
     @cherrypy.expose
     def testSynoNotify(self):
         cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
@@ -2703,14 +2721,14 @@ def comingEpisodes(self, layout="None"):
 
         done_show_list = []
         qualList = Quality.DOWNLOADED + Quality.SNATCHED + [ARCHIVED, IGNORED]
-        sql_results = myDB.select("SELECT *, tv_shows.status as show_status FROM tv_episodes, tv_shows WHERE season != 0 AND airdate >= ? AND airdate < ? AND tv_shows.tvdb_id = tv_episodes.showid AND tv_episodes.status NOT IN (" + ','.join(['?'] * len(qualList)) + ")", [today, next_week] + qualList)
+        sql_results = myDB.select("SELECT *, tv_shows.status as show_status FROM tv_episodes, tv_shows WHERE season > 0 AND airdate >= ? AND airdate < ? AND tv_shows.tvdb_id = tv_episodes.showid AND tv_episodes.status NOT IN (" + ','.join(['?'] * len(qualList)) + ")", [today, next_week] + qualList)
         for cur_result in sql_results:
             done_show_list.append(int(cur_result["showid"]))
 
-        more_sql_results = myDB.select("SELECT *, tv_shows.status as show_status FROM tv_episodes outer_eps, tv_shows WHERE season != 0 AND showid NOT IN (" + ','.join(['?'] * len(done_show_list)) + ") AND tv_shows.tvdb_id = outer_eps.showid AND airdate = (SELECT airdate FROM tv_episodes inner_eps WHERE inner_eps.season != 0 AND inner_eps.showid = outer_eps.showid AND inner_eps.airdate >= ? ORDER BY inner_eps.airdate ASC LIMIT 1) AND outer_eps.status NOT IN (" + ','.join(['?'] * len(Quality.DOWNLOADED + Quality.SNATCHED)) + ")", done_show_list + [next_week] + Quality.DOWNLOADED + Quality.SNATCHED)
+        more_sql_results = myDB.select("SELECT *, tv_shows.status as show_status FROM tv_episodes outer_eps, tv_shows WHERE season > 0 AND showid NOT IN (" + ','.join(['?'] * len(done_show_list)) + ") AND tv_shows.tvdb_id = outer_eps.showid AND airdate = (SELECT airdate FROM tv_episodes inner_eps WHERE inner_eps.season > 0 AND inner_eps.showid = outer_eps.showid AND inner_eps.airdate >= ? ORDER BY inner_eps.airdate ASC LIMIT 1) AND outer_eps.status NOT IN (" + ','.join(['?'] * len(Quality.DOWNLOADED + Quality.SNATCHED)) + ")", done_show_list + [next_week] + Quality.DOWNLOADED + Quality.SNATCHED)
         sql_results += more_sql_results
 
-        more_sql_results = myDB.select("SELECT *, tv_shows.status as show_status FROM tv_episodes, tv_shows WHERE season != 0 AND tv_shows.tvdb_id = tv_episodes.showid AND airdate < ? AND airdate >= ? AND tv_episodes.status = ? AND tv_episodes.status NOT IN (" + ','.join(['?'] * len(qualList)) + ")", [today, recently, WANTED] + qualList)
+        more_sql_results = myDB.select("SELECT *, tv_shows.status as show_status FROM tv_episodes, tv_shows WHERE season > 0 AND tv_shows.tvdb_id = tv_episodes.showid AND airdate < ? AND airdate >= ? AND tv_episodes.status = ? AND tv_episodes.status NOT IN (" + ','.join(['?'] * len(qualList)) + ")", [today, recently, WANTED] + qualList)
         sql_results += more_sql_results
 
         # sort by air date