Cleanup after Font Awesome upgrade
Cleanup after Font Awesome upgrade
Fixing conflict
Merge branch 'clrux/update-font-awesome-4.2.0' into talbs/update-font-awesome-4.2.0