Rewrite of Glossary by Florian
Merge branch 'master' of https://github.com/DigitalPublishingToolkit/Hybrid-Publishing-Toolkit-for-the-Arts

Conflicts:
	docs/11_glossary.md