fixed server and client
Merge branch 'tests' of github.com:alvar21/LinkBroker_3231 into tests
Merge branch 'tests' of github.com:alvar21/LinkBroker_3231 into tests