Fix missing deletion method in usercontroller
Fix merge conflicts
Merge branch 'dev-set3-filter' into dev-set3-iteration5