font-awesome to 4.2.0
 v 0.3.4
Merge branch 'master' into dev