work
Merge branch 'master' of https://github.com/PhilippSteiner/EVIT-ACTIVITI into wolfgang
Merge pull request #32 from PhilippSteiner/wolfgang

Wolfgang