Merge branch 'hotfix/2.0.1' into develop

* hotfix/2.0.1:
  * Updated gems
FontAwesome 4.0.2
Updated gems
Merge branch 'release/2.1.0'

* release/2.1.0:
  FontAwesome 4.0.2 Updated gems