added fontawesome
Merge branch 'master' into views

connect