Merge branch 'master' of https://github.com/PhilippSteiner/EVIT-ACTIVITI into Michael

neues Projekt
Merge branch 'Michael'

neues Project