Updated word glossary file
Updated glossary file (doc)
resolved merge conflict
Merge branch 'master' of https://github.com/ActoreX/github-fwd