Using local copy of font-awesome
Merge remote-tracking branch 'openshift/master'