Subir archivos
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Umeca/src/main/java/com/umeca/controller/catalogs/InsertCatalogController.java
	src/Umeca/src/main/java/com/umeca/service/catalog/InsertCatalogService.java
	src/Umeca/src/main/java/com/umeca/service/catalog/InsertCatalogServiceImpl.java