added timer to the villagers screen
merge conflicts resolved in mafiaStartScreenServer|manigann,melaniem