WIP
WIP
Merge remote-tracking branch 'origin/integration' into dev-cs
AUTO-536 Fatal Error when trying to create a feed from the catalog tab
Function grabpress_edit_fedd name changed to edit_feed
Merge pull request #148 from GrabNetworks/dev-cs

Dev cs AUTO-536