cambios
cambios
cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	negosys/src/main/resources/persistence.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	negosys/src/main/resources/persistence.properties