add font awesome
merge changes