Full and partial feedback fix
Merge branch 'master' of https://github.com/ioi-germany/cms into fancy_feedback
tobis idee
I am tired
dunno
merge