Updated font awesome
Merge