Merge branch 'master' into dev
updated font stylesheet
Merge branch 'dev'