Fucked up fontawesome stuff, bring it back!
Merge branch 'develop' into gh-pages