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

Conflicts:
Catalog.xcodeproj/project.pbxproj
Catalog/Resources/Tables_Chairs/TablesChairs/Rafael-A-00-24-A.png
Catalog/Resources/Tables_Chairs/TablesChairs/Rafael-A-00-24-B.png