Feature/glossary

A working version of the glossary to be merged into develop