Merge branch 'hotfix/FontFixed'
LinkError and Fontawesome back to v3.
Merge branch 'hotfix/LinkError-v2' into develop