Renaming the identifier of the users and roles to plain id.
Merge branch 'Authentication'