working on users docs
Merge branch 'master' into users
started on users