Client initial commit
Merge remote-tracking branch 'origin/client'