Maps and stuff
Merge branch 'breno-map'

Conflicts:
	nbproject/project.properties
	src/zombies/GameEnvironment.java