added admin user edit and added userType
merge conflit resolved
Merge branch 'master' of https://github.com/Vipeax/Wetzelplaats.git