push new branch to git
Merge branch 'master' into sangraama-static-server-clone
Merge branch 'master' into sangraama-static-server-clone
Merge branch 'master' into sangraama-static-server-clone
Merge branch 'master' into sangraama-static-server-clone
Merge branch 'master' into sangraama-static-server-clone
Merge branch 'master' into sangraama-static-server-clone
Pull master
Merge branch 'master' into sangraama-static-server-clone
Merge branch 'master' into sangraama-static-server-clone
Fixed merge conflicts
Revert "Connecting between servers handled by client success"

This reverts commit 8001cc9c5e6f98b882794f354c5dd856ce5a703a.
Fixed issues after revert
Merge branch 'master' into sangraama-static-server-clone