Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
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