kj

Conflicts:
	TecnoSalud-ejb/nbproject/private/private.properties
	TecnoSalud-war/nbproject/private/private.properties
	nbproject/private/private.properties