FontAwesome 4.0.2
Updated gems
Merge branch 'release/2.1.0' into develop

* release/2.1.0:
  FontAwesome 4.0.2 Updated gems