workspace.xml ig
Merge remote branch 'origin/master'

Conflicts:
	.idea/workspace.xml
update catalogs
Merge remote branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app.js
	config/routes.json
Delete and GetAll Catalogs
Merge remote branch 'origin/master'

Conflicts:
	.idea/workspace.xml