Modificaciones en otros archivos
Merge develo into origin/develop
Merge origin/develop into develop

Conflicts:
	src/main/resources/META-INF/persistence.xml
	src/test/java/eui/miw/pfm/models/entities/ProjectTest.java