font-awesome 4.0
Merge pull request #647 from rtfd/font-awesome

font-awesome 4.0