* 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: (335 commits)
Fixing an infinite loop (!!) and focusing in on the comment textbox when sharing a story.
Fixing bug on empty river.
Use the selected feed view when viewing a story
Preventing multiple saved stories from being deleted. Also removing activities when removing saved stories.
Fixing accidental truncation on story when saved.
Fixing story detail height in Text view when saved with tags.
Fixing text tab view.
Updating readability.
Using https for twitter images. Adding a twitter photo sync to fix broken twitter photos. Thanks to @ggrappone for finding this one.
Counting dupe feeds only once in unread counts.
Fixing bookmarklet for NYTimes. Thanks to @rafeco for catching the bug.
Fixing bounce on resize.
disable debug
Mark-read idempotency for social feeds. (#460)
Idempotent mark-as-read DB ops. (#460)
Cleaning up unread counting. (#460)
Fixing height issues with new saved stories sideoptions box.
Limiting new user queue.
Limiting new user queue.
Max overlay fully fade slightly sooner when scrolling down. (#459)
...
* master: (38 commits)
New Play Store image assets.
Fix layout bug on small screens.
Revert "Updating stories which give integrity errors."
Fix laggy updates for saved stories unsave ops.
Ability to unsave stories.
Make height of saved stories row match other folders.
Make rows reliably hilight when tapped. (#282)
Allowing replacement of story dates on integrityerror updated stories.
Swapping errors.
Updating stories which give integrity errors.
Fixing margin on subscribe/follow taskbar button.
Upgrading Android Studio.
Fixing #261. Decoding html entities in story titles (both in the share dialog and in the story detail view).
Flattening gradients on feed and story selection. Adding colored background back in to selected river stories.
Fixing modal resizing. Thanks to @tomtaylor for finding the broken dialog.
Remove unused ABS progress indicator support for reading view.
Implement #426 - preference to show/hide public comments
Pressed state for overlay_done button.
Pressed states for all overlay buttons.
Fit overlays on 360dp screens. Move progress indicator to overlay. Add progress indicator for text mode.
...
