Aardwolf-Social/aardwolf 2 merged

• Formatting Jun 26
• Update deps Jun 26