fonts working on dev
Merge branch 'develop' into staging