Feature/team average billing model

team average billing model