Started adding support for margin and spacing in Spritemap