new assets and add one macro
new zombie assets
new civilian assets
new assets
collisions with map
remove debug lines
Merge branch 'master' of github.com:ushu/z-project

Conflicts:
	z-project.xcodeproj/project.pbxproj
	z-project/GameLayer.mm