Updated fontawesome version to latest 4.0.0-wip and modified corresponding html
Merge branch 'develop' into gh-pages