Fix admin/users/edit/:id not correctly displaying current role
Update lib acl/Acl, add acl/Acl::user_role() to get a user's role
Merge branch 'develop' into feature/users