Corrigiendo Errores
Merge branch 'master' of https://github.com/sclMAX/IndumaticsGestion

Conflicts:
	nbproject/private/private.xml