* master:
Fixing scroll for search when loading feed detail.
Fixing multi-word search queries on ios.
Adding search bar to ios.
Adding messaging for premium-only in saved story tags.
Colorizing payment logging.
Colorizing payment logging.
Second typo. Stupid payment code can't be tested offline.
Typo.
Forcing re-sync of payment history on expiration.
Cleaning up payment history logging.
Fixing chooser dialog by forcing it to conform to modernized modal.
Conflicts:
media/js/newsblur/reader/reader_feedchooser.js
* master:
Fixing credit card images. Doh\!
Upping feed fetching.
Removing random interval in feed fetches.
No longer random intervals for dead feeds.
Fixing mark as unread in redis hash migration.
Fix group type caching in FolderList, and much refactoring for readability therein.
Remove special All Stories group and make the now-visible root folder perform it's function.
Formalize top-level folder name workaround.
Nonfunctional refactoring in list adapter (unused vars, method visibilities, annotations).
Fix an initialization edge case in creating column/resource ID mappings.
Fix regression in API to get /reader/feeds and set update_counts to true.
Factor out duplicate code in APIClient to ensure parameterized GETs behave like bare GETs.
Refactor FolderListFragment and associated Adapter.
Fix bad merge.
Remove accidentally added swapfile.
Removed missing root feed workaround. Refactoring FolderListFragment for readability.
Clean up parsing of /reader/feeds response and work around problems with empty-named root folder.
Fix NPE crash when adding new feed.
Conflicts:
apps/rss_feeds/views.py
* master:
Trying out a gunicorn haproxy backend.
Re-upping 12 to 64 free feeds.
Removing Redis state for socket.io. Too many open mongo connections.
Referencing new secret hosts.
Removing hosts.
Adding dev hosts.
Using new secrets repo instead of ignored files.
