Merge branch 'master' of https://github.com/Uccart/UCCART

Conflicts:
	UCCART_JPA/build/classes/META-INF/persistence.xml
	UCCART_JPA/src/META-INF/persistence.xml
Nuevo