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
Merge pull request #137 from tkowark/develop-ak

Merge Develop-AK into Develop
merged master into develop