BigW Consortium Gitlab
Conflicts: app/controllers/admin/teams/projects_controller.rb app/views/team_members/_team_member.html.haml app/views/teams/members/_member.html.haml