Merge branch 'master' into LaTeX_documentation_holzi
Deleted alphadin, corrected literature.bib
deleted nocites
Merge branch 'LaTeX_documentation_holzi'

Conflicts:
	doc/LaTeX/literature.bib