added edit button in FeedView
Merge remote-tracking branch 'origin/master'