[Maus]
Merge branch 'master' of https://github.com/GordonWiegand/tina

Conflicts:
	binder.aux
	binder.log
	binder.pdf
	binder.tex
	binder.toc