Merged master in dev

Conflict between fancy goasts and fix for respawn timer