Merging font awesome 3.0 branch

Merging