Merge commit '080a3ab3' into dev

config/glossary.tex

-\usepackage[indexonlyfirst]{glossaries}
-\setacronymstyle{long-short-desc}
 \makeglossaries
 
 \makeglossaries
@@ -383,3 +381,17 @@
 	first={Alen Marsh, Dean of the Marsh}
 	}
 
+\newglossaryentry{prefforce}{
+	name={Prefect Sailon Quennome},
+	description={a sly man from the Quennome region whose elven grandmother has left him noticeably shorter than the other students},
+	text={Sailon},
+	first={Sailon Quennome}
+	}
+
+\newglossaryentry{prefconjuration}{
+	name={Prefect Dane Arthur},
+	description={a bright eyed young farmhand, who still patches his own clothes},
+	text={Dane},
+	first={Prefect Dane Arthur}
+	}
+