deleted deprecated client and server
Merge origin/master