Merge branch 'hotfix/LinkError'
Fontawesome Fixed.
Merge branch 'hotfix/FontFixed' into develop