Squashed 'client/' content from commit 0b1d52a

git-subtree-dir: client
git-subtree-split: 0b1d52a155b4909fdb3ea0896b7ac96043906937
Merge commit '8ade63d4df50bef87152f4b0899dadb0e5dbb457' as 'client'
no longer need to ignore client directory with git subtree