accounted for deleting activities
Merge branch 'master' into phil/news_feed
Made news feed link to drink or shop as appropriate.
Added favoriting items to news feed.
Destroy activity related to a deleted review.
Merge pull request #9 from KatherineMuedas/phil/news_feed

Phil/news feed