Updated FontAwesome to 4.0.1
Merge branch 'dev' into beta
Merge branch 'beta'