Philipp Branching
Merge pull request #1 from PhilippSteiner/Philipp

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