Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Using pipeline for syncing redis user stories.
Fixing pipeline.
Increasing task queue size.
Forcing pipeline to flush every 1000 stories.
Adding user+feed user story sync, to be used soon on feed requests to clean out users read stories.
Adding pipeline for redis sync on usersub.
Cutting off syncable stories.
Syncing redis on 1% of feed loads.
Fix issue where selection within stories was hidden

Applied only to list view on dev.
Merge pull request #157 from calebegg/master

Fix issue where selection within stories was hidden in list view on dev
Merge remote-tracking branch 'upstream/master'
Fix #140. Delete feed now works and confirmation dialog has been added.
Remove log call from DeleteFeedFragment
Merge pull request #158 from manderson23/master

Android: Fix deleting feeds and add confirmation dialog
Fix for #159 force close during add feed (auto complete) now that is is enabled
again
Merge pull request #160 from lance0428/master

Fix for #159 force close during feed search
Fix registration regression bug caused by #151