Unified screen system; fixed monster spawning issues
Merge remote-tracking branch 'origin/master'
Neatened up spawning algorithm