Updated glossary.tex
merged hazard and risk branches