* master:
iOS app versin 4.0.3.
Fixing intelligence trainer when training in folder.
Showing user-created training tags/authors in feed trainer.
Correctly handling drag events on folder titles.
Showing correct Done/Next button status based on actual stories loaded. This one's for @immad.
Moving to stricter story diff check. Using story hashes instead of grab bag by date when checking existing stories.
Fixing digitalocean's missing 96GB size.
* master:
Now forcing image sizing.
Upgrading feedparser.
Fixing RSS feed for blurblogs by using permalinks instead of guids.
Treat 12:00am as occurring at the start of the day
Adding monit for work server.
Removing starred stories from mongo backups.
Logic error.
New algorithm for figuring out how long to renew.
* master: (40 commits)
Version 3.6 of the iOS app.
Fixing tolerance on drag bar.
Fixing switch between story titles on left and on bottom.
Cleaning up after failed backup.
Fixing disappearing righttoolbarmenu icons. Adding preferences for urls to use in-app browser, safari, or chrome.
Fixing transition cancelation on interactive swipe on ipad.
Fixing rotation issues, as well as premature hiding of dashboard on animation on ipad.
Fixing interactive transitions.
Fixing many issues with transitions on the ipad. Still need to fix the interactive transition completion.
Fix#441 - changing text size needs to call evaluateJavascript instead of loadUrl when targeting SDK >= 19
Fixing swipe-back on ipad for transitioning b/w feed list and feed detail.
Fixing paddings on story titles.
Resizing user avatar.
Adding option for side swipe in story detail.
Android v3.0.1.
Fixing cutoff date when retrieving stories.
Mark older/newer stories as read.
Fixing issue with autocomplete.
Fixing infinite loop.
Trying out better autocomplete search with parts.
...
* master:
Adding Pinterest.
Tightening up comments line height.
Correctly render DB changes in folder list more quickly.
Fixing empty story hashes.
Cleaning up kill utils.
Clean up ItemList subclasses.
Clean up ItemsList subclass tagging and lifecycle.
Fix backwards error catch.
Refactor page-crawling in *Reading activities to fix looping. (#387)