I did something with userfeedback 2 days ago. And I forgot.
Merge branch 'master' of https://github.com/zentojamorn/kafra

Conflicts: