Mapped user roles.
Merge remote-tracking branch 'origin/master'
Changed some user settings.