Wall types
Merge branch 'master' of https://github.com/Trayus/cpgd_diskwars

Conflicts:
	DiskWars/DiskWars/DiskWarsContent/maps/placeholder.png
	DiskWars/DiskWars/DiskWarsContent/maps/testmap.png