fix for text header missing size (MOB-1628)
Merge pull request #4 from patrickmeehan/feature/glyph-padding

Feature/glyph padding
fixed some minor merge conflicts
merged in latest from develop-new