Updated to Font Awesome 3.1
Merge branch '2.8'