Final Maps added
Remove old maps
Merge branch 'master' of https://github.com/ushu/z-project

Conflicts:
	z-project.xcodeproj/project.pbxproj