Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
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
Have RegisterProgressFragment finished via noHistory Manifest option
rather than hackish finish with Fragment. Improve comments
Merge pull request #162 from lance0428/master

Fix registration regression post #151 commit
Rejiggering autocomplete to only include > 10 subs.
Merge branch 'master' into circular

* master:
  Rejiggering autocomplete to only include > 10 subs.
  Have RegisterProgressFragment finished via noHistory Manifest option rather than hackish finish with Fragment. Improve comments
  Fix registration regression bug caused by #151
  Fix for #159 force close during add feed (auto complete) now that is is enabled again
  Remove log call from DeleteFeedFragment
  Fix #140. Delete feed now works and confirmation dialog has been added.
  Fix issue where selection within stories was hidden