Encode font as Base64 and fix manifest file.
Remove fonts folder and fix merge conflicts