Templates
Merge branch 'master' of https://github.com/sven-hornberg-1314-fhb/Web106