solved #393
Merge branch 'feature/remove' of https://github.com/hpi-swt2/hpi-hiwi-portal into feature/remove
first changes
fixed a bit
solved #342
first changes