Merge glossary changes into Master

Added terms and definitions to the glossary page, these need to be added to the master branch.