Template change: Made sure to make a new page for glossary/abbrev
Merge branch 'master' into bachelor