* master: (80 commits)
Handling error when user's twitter connection doesn't work.
Handling missing social subs caused by cached subs on android.
Updating elasticsearch to 0.90.13.
Checking premium status on paypal sync.
Bumping Android to 4.1.0b1.
Syncing offline status text with ios.
Buffer more stories while reading.
Fix login crash.
Fix logout crash.
Cap the duty cycle of expensive background services to prevent resource hogging.
Remove status message flicker.
Remove logging.
Ensure stories always load more buffer on start of reading activity. Ensure story load cancels quickly on return to feed list.
Tone down some logging.
Fix crash if user touches reading overlay before cursor is ready.
Fix reading progress indicator if new unreads are found during reading session.
Fix lock crash in legacy DB.
Ensure reading progress meter works on async load.
Discard stale stories if a reading action happens during fetch.
Fix crash.
...
* master:
Adding to regular /reader/feeds (non-flat) as per @manderson23's request. See 23bc4f2.
Adding ratelimit to friends list.
Showing is_staff on mobile devices. Useful for #631.
Logging signals for paypal.
Seeing if signals can be moved around.
Splitting paypal webhook events. Adding payment logging.
Fixing missing paypal IPNs.
Bumping android to v4.0.2.
v4.6.0 enterprise.
Submitting v4.6.0
Fixing ipad rotation page movement. Also correcting story position scrolling.
* 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
