update docs
rename 'server' to 'client'
Merge remote-tracking branch 'origin/master'