implemented Adding/deleting/refreshing feeds
Fixed merge conflicts