Merge branch 'Folien' of ssh://git.breab.org:2223/kai/MasterArbeit into Folien
# Conflicts:
# KIT_beamer/SDQ_vorlage_beamer.bcf
# KIT_beamer/SDQ_vorlage_beamer.log
# KIT_beamer/SDQ_vorlage_beamer.nav
# KIT_beamer/SDQ_vorlage_beamer.pdf
# KIT_beamer/SDQ_vorlage_beamer.run.xml
# KIT_beamer/SDQ_vorlage_beamer.snm