[*] Client/server logic changed.
Merge branch 'master' of github.com:ivanepifanov/Barabash