cambios en el tvchat
Merge remote-tracking branch 'origin/daas' into daas

Conflicts:
	.idea/deployment.xml
mirar
Merge remote-tracking branch 'origin/daas' into daas
agregado fotos gabi
agregado fotos gabi