resolving sprite-based CSS rules in conflict with icons used now
Additional PR fixes
Merge branch 'clrux/update-font-awesome-4.2.0-v2' of https://github.com/edx/edx-platform into clrux/update-font-awesome-4.2.0-v2