Fix issue font-awesome
Merge commit '921b822eb3bd104b154f73b8491bf5f38eab5187'
Fix issue when doing deploy