improving team and role association with the users
Merge branch 'ft_user_based_roles'