Ugly fix for font problems
Merge branch 'develop'
Merge branch 'master' into custom
Precompile assets