Merge branch 'hotfix/1.0.2'

* hotfix/1.0.2:
  Updated version number Updated change log
Merge branch 'release/2.0.0'

* release/2.0.0:
  Fixed CONTRIBUTING.md Updated CHANGELOG Updated Bootstrap Updated FontAweseome Updated rake task to support FontAwesome 4.0.0
Merge branch 'release/2.1.0'

* release/2.1.0:
  Fontawesome 4.0.1 Updated CHANGELOG Bumped version to 2.1.0
Merge branch 'release/2.2.0'

* release/2.2.0:
  Bootstrap 3.0.1
Merge branch 'release/2.3.0'

* release/2.3.0:
  * Bootstrap 3.0.1 @ [de271bf612](https://github.com/twbs/bootstrap/tree/de271bf6122d2d43a449518c08d00f9a507af874) * FontAwesome 4.0.2 @ [836d4d87e4](https://github.com/FortAwesome/Font-Awesome/tree/836d4d87e459b71932b7d033f6cf34539e6d5b79) * Fixed changelog
Merge branch 'release/2.4.0'

* release/2.4.0:
  * Bootstrap 3.0.1 @ [13b96677ba](https://github.com/twbs/bootstrap/tree/13b96677bacf3de360a762d11ad0e0007f0710da) * FontAwesome 4.0.3 @ [0373b63c16](https://github.com/FortAwesome/Font-Awesome/tree/0373b63c16d7aa31b6715c3f81a98a2ffb9f40a6)
Merge branch 'release/2.5.0'

* release/2.5.0:
  * Bootstrap 3.0.2 @ [463343af63](https://github.com/twbs/bootstrap/tree/463343af63344dbbc3db04f40b0b804baa919b7e)
* Rails 4.0.2
* Rails 3.2.16
Merge branch 'hotfix/2.5.1' into develop

* hotfix/2.5.1:
  * Rails 4.0.2 * Rails 3.2.16