Configuración correcta con HSQLDB
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/resources/project.properties