Merge remote-tracking branch 'upstream/online' into online
Fixes font-awesome icons in all browsers
Merge pull request #31 from spurtell/online

Fixes font-awesome icons in all browsers
Merge pull request #32 from openshift/online

Online => Master sync