Merge branch 'hotfix/0.5.1' into develop
Updated gems
Fontawesome 3.2.1
Updated CHANGELOG
Bumped version to 0.6.0
Merge branch 'release/0.6.0'