?
Merge branch 'master' of https://github.com/spidamoo/sod.git

Conflicts:
	SoDlib/SoDlib.layout
	mapEditor/bin/Debug/mapEditor.exe
	mapEditor/bin/Debug/map_editor.log
	mapEditor/obj/Debug/main.o
создание платформ