Added font awesome to the source
Merge remote-tracking branch 'origin/master'