* master:
Moving classifiers when recreating destroyed feeds.
Code to recreateaccidentally destroyed feeds.
Adding SSL certificate assembly fab command.
Skip saved feeds which have fake unread counts.
Fixing saved story view for users with preference to open first unread story, thereby switching them out of saved mode and into unread mode.
Adding copy_db_settings to fabfile.
Fixing specified image sizes.
Only premiums users can share multiple stories from a single feed per day.
Faster delete user (for combating spam).
Boosting XL font size.
* master: (492 commits)
Fixing renewal dialog.
Better feed count for muting.
Preventing dupe stories in feed view.
Adding mute feeds feature for premium users.
Adding auto-activate for flat feeds.
Submitting v4.1.0.
Last beta of ios 4.1 before release.
Showing refresh notifier when returning to app.
Fixing urls for folders with dashes in the title.
Removed transition.
Transitioning from tag to tag/feed_id.
Max of 3 updates per fetch.
Upgrading mongodb mms agent.
Showing saved stories explainer for empty saved stories.
Removing mark read button in story titles bar when on saved view.
Fixing updates_off in tasks.
Adding updates_off run-time setting for handling large spikes of updates.
Draining feeds also clears out error feeds.
Fixing errors with missing story content from ifttt.
OMG, I shipped a 3 second sleep. Doh!
...
Conflicts:
apps/reader/models.py
* saved:
Removed transition.
Showing saved stories explainer for empty saved stories.
Removing mark read button in story titles bar when on saved view.
No feed rss for saved stories by feed.
Counting saved stories when not count exists.
Count feed_id starred stories when totals don't match.
Switching to upserts for saved stories.
Fixing size on emails.
Adding renew links to premium grace and expire emails.
Adding renew links to premium grace and expire emails.
Better sizing on intelligence slider. Takes all segments into account when resizing.
Narrow classes should be applied at initial drawing.
Fixing spacing on intelligence slider.
Updating story feed starred counts on marking starred and unstarred on both backend and client.
Fixing numerous bugs around saved story views.
Showing correct stories when switching intelligence slider.
Showing starred stories when in starred view mode.
Showing starred counts on every feed. Just needs reading and bug fixes.
Adding feed counts for saved stories. Need to show counts next to feeds.
