verificación terminada
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Umeca/src/main/resources/jpaContext.xml
verificación terminada
Merge remote-tracking branch 'origin/master'