added annotations :)
Merge branch 'develop-ak' of https://github.com/tkowark/hpi-hiwi-portal into develop-ak