Merge "Adding Edit catalog functionality"