# By Samuel Clay (2) and ojiikun (2)
* master:
Adding node group to fabfile.
Fix crash on empty use pictures.
Correcting for feedburner stupidity.
Auto-sync the feed/folder list if it has been more than 10 minutes since the last refresh.
* master:
Fixing scrolling height when mouse indicator position is locked. Expands padding to fit the bottom-most story. Thanks to @bdarnell and @dancarroll for the push. Fixes#230.
Slight cleanup of fabfile.
Adding all role to send commands to every server (specificaly setup_hosts).
* master:
Fixing Underscore in bookmarklet to handle sites with window.exports functionality, which breaks _. Thanks to @kyleniemeyer for finding the bug.
* 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