Merge pull request #31 from dostapenko/server_client_fleshing

router client, server client written and tested. integration testing run
Merge branch 'master' into glossary