fixed the font location for Font Awesome
Merge branch 'develop'