Integrated FontAwesome
Merge branch 'fontawesome' into develop