Merge pull request #227 from hiars123/master

Doku (slideshow, video, karte)
Doku Update
Präsentation Update1
Merge pull request #228 from Litschi/master

Präsentation Update1