Merge branch 'master' into development
Updated Typekit font settings
Merge branch 'development'