Hand edit the thalia docs
Merge branch 'develop' of github.com:arrdem/grimoire into develop