glossarupdate zwischendurch
Merge branch 'master' of https://github.com/fooWander/tui_swp_formula

Conflicts:
	doku/entwurf/Entwurfsdokument_template.tex