add font-awesome
Merge branch 'tmp'