added support for font files in assets
compilation issues
Merge branch 'master' into beta