Add Spacing and Margin to SpriteSheet

Just pushing the updated version of the #486, also see #484.