refactoring
Merge branch 'develop' of github.com:tkowark/hpi-hiwi-portal into develop