added manage family page
merged coflicts