cambios
Merge branch 'master' of https://github.com/electrocompay/Catalog

Conflicts:
	.DS_Store
	Catalog/Resources/.DS_Store
	Catalog/Resources/Tables_Chairs/.DS_Store