Merge branch 'orig_size' into blendadd

Conflicts:
	spritesheet/AnimatedSprite.hx