correcciones en download del cliente
Merge branch 'master' of github.com:gitdb2/redes_comunicacion

Conflicts:
	ContentServer/ContentServer/ContentServer/Program.cs
	ContentServer/ContentServer/ContentServer/settings.properties