Cambio de supervisor
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Umeca/src/main/java/com/umeca/service/catalog/InsertCatalogServiceImpl.java
	src/Umeca/src/main/resources/jpaContext.xml