Updating Catalog page
Resolving merge conflicts
Merge remote-tracking branch 'origin/frmCatalog'