User role done
Merge pull request #449 from sexnothing/user

User role done