Fixed a bug that occured after changing inheritance of user model
Merge branch 'master-dev' of https://github.com/foxhide/PKSU-Gruppearbejde into master-dev
fixed inheritance bug in usermodel