Merge origin/master into david
Revert "Parte Servidor de Amigo"

This reverts commit 9af179bc00252a0533a1f130af6ba653955fd897.
Merge origin/master into david
Merge origin/master into david
Merge origin/master into david