Start of nonprimitive integration into editor
Merge remote-tracking branch 'origin/master'

Conflicts:
	MythosMan.gmx/sprites/spr_hero.sprite.gmx