Merge remote-tracking branch 'origin/master'

Conflicts:
	4.- Código/AnaIsRepo/nbproject/private/private.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	4.- Código/AnaIsRepo/nbproject/private/private.xml
Logos

cambios en clientes
Merge branch 'master' of https://github.com/ijsalazarmx/gestionProyecto