1
Merge branch 'master' of https://github.com/alzhuravlev/vagon-gfx

Conflicts:
	items/platform/platform.wings~