24 running tests
Merge branch 'master' of https://github.com/tkowark/hpi-hiwi-portal
Merge branch 'master' of https://github.com/tkowark/hpi-hiwi-portal
Merge branch 'master' of https://github.com/tkowark/hpi-hiwi-portal
Merge branch 'master' of https://github.com/tkowark/hpi-hiwi-portal
merged master into develop