Merge pull request #65 from PhilippSteiner/Alex

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