added squad and faction to Player, with some add and remove functions