Integrating pull request from gigocabrera into new branch
Taking out the fontawesome update as it will be done in a separate branch