Fixed a few merge-conflict related bugs...
Merge branch 'master-dev' of https://github.com/foxhide/PKSU-Gruppearbejde into master-dev
Removed getUser function from MSC. Added admin field in UserModel.