User role and user edit done
Merge pull request #443 from sexnothing/user

User role and user edit done