Extracted generic Entity from Zombie and Survivor, simplified tests
Merge remote-tracking branch 'origin/master'