CSAT + AAF Change Group Composition

Moved them to using Two Fire Teams Per Squad