Minor updates to the Feeds controller
Adding delete feed button.
resolved conflicts
Added hiding functionality to Entries. Also fixed some parsing issues.
Replaced button with x image.
Trying to fix merge.
Fixed merge conflicts.