user controller fixes
Merge branch 'cleancontroller'
groups fix
Merge branch 'master' of https://github.com/191-Group-4/partner
Merge branch 'master' into cleancontroller