Merge branch 'master' into beta

src/server/shared/ent/teamdata/TB_Shared_Ent_TeamData_Appointment.php

@@ -383,7 +383,8 @@ class TB_Shared_Ent_TeamData_Appointment extends Francis_Db_Row
 
         // Check if user is not approved in group yet
         $profileTeamData = $profile->getTeamsData($this->team_id);
-        if ($profileTeamData['status'] === TB_Shared_Ent_TeamData_Profile::STATUS_NOT_APPROVED) {
+        if ($profileTeamData['status'] === TB_Shared_Ent_TeamData_Profile::STATUS_NOT_APPROVED ||
+            $profileTeamData['status'] === TB_Shared_Ent_TeamData_Profile::STATUS_INACTIVE) {
             $isVisible = false;
         }