Don't count dead players
Merge branch 'GYDeathFix' into stable-test

Conflicts:
	client-data