User edit fixed
Edit user fixed
Merge conflicts :/
Merge branch 'master' of https://github.com/utwente-di/di07