hj

yg
Merge branch 'master' of https://github.com/latino87/TecnoSalud

Conflicts:
	TecnoSalud-ejb/nbproject/private/private.properties
	TecnoSalud-war/nbproject/private/private.properties
	nbproject/private/private.properties
Merge branch 'master' of https://github.com/latino87/TecnoSalud