Merge branch 'master' into movefeed

* master: (90 commits)
  Correctly limiting stories in rss feeds.
  Correctly limiting stories in rss feeds.
  Correctly limiting stories in rss feeds.
  Handling errors with sharing stories.
  Android 4.0.0b1.
  Handling removed stories from mark as unread.
  Bump version number to force DB reset.
  Make read-story retention default off.
  Tweak status LnF.
  Adding extra narrow content setting to fix sideoptions width.
  Swap in cached images if offline.
  Don't imply unread status from unread hash list if not premium.
  Clean up noisy image loader logging.
  Don't drop pending feed loads during sync.
  Fixing unread count sizing on folder headers.
  Fix binding of multi-feed API responses.
  Fix loading of saved stories to use normal stories table.
  Option to enable image caching.
  Image prefetching.
  More efficient thread re-use in sync service.
  ...
Merge branch 'movefeed' into organizer

* movefeed: