changed delete feed logic
Merge branch 'skwak'