Place maps back in their group
Add custom timers for zombies to appear

code needs some cleanup/renaming but I am too tired...
Merge branch 'master' of https://github.com/ushu/z-project
Merge branch 'master' of https://github.com/ushu/z-project