New read stories view.
Merge branch 'master' into readstories

* master: (30 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.
  Fix disappearing + signs in story title list. (#439)
  Fix imageloader crash.
  Fix crash on group collapse.
  Fix crash on feed search.
  Fix crash on failure to load textmode for a story.
  ...
Merge branch 'master' into readstories

* master:
  Fixing view destroy for comments.
  Fixing a number of big memory leaks.
  Fixing story intelligence trainer.
Merge branch 'master' into readstories

* master: (292 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)
  ...

Conflicts:
	media/css/reader.css
	media/js/newsblur/reader/reader.js
	media/js/newsblur/views/story_titles_header_view.js
Merge branch 'master' into readstories

* master: (78 commits)
  Adding 401 status code for invalid token on user/info.
  Adding new preference for 24 hour clock. Moving to client-side generated dates.
  Adding IFTTT logging.
  All dates in iso 8601 format.
  Use strings for feed_id.
  Fixing unread trigger for IFTTT.
  Updating shared story ifttt entries.
  Fixing ReadKit flat folders by leaving out removed feeds.
  Adding handlers for all stories.
  Fixing ifttt timestamp.
  Adding share story action for IFTTT.
  Adding site title, website, and address to each IFTTT trigger.
  Adding share username to ifttt share trigger.
  Upping access token expiration to 10 years.
  Using TitleCase instead of snake_case.
  Fixing exception dialogs to correctly update on fixed addresses and links.
  New saved story as per IFTTT action.
  Updating IFTTT urls.
  IFTTT action for new subscriptions.
  Adding folder list for dynamic action fields.
  ...
Limiting feed search to 1000 feeds.
Fixing exploding river in ifttt.
Fixing premium expire date for users without expiring premiums.
Fixing invalid premium_expire date.
Add support for SNI and update requests.
Updating lxml to 3.3.5 to fix two big html diffing issues: whitespace being removed between links, and newlines being removed in <pre> tags.
Don't barf if no search server available.
Remvoing pdb.
Adding three ios fonts.
Adding line spacing option to iOS app.
Fixing ipad popover size. Adding default line height.
Fixing iOS bug around training in social feeds.
Converting from PIL to Pillow.
Fixing massive icon problems by removing support for Windows ICO files.
Fixing kill gunicorn command.