Merge branch 'hotfix/0.6.4'

* hotfix/0.6.4:
  * Added Gemfile.lock to .gitignore
Merge branch 'release/0.7.0'

* release/0.7.0:
  Rails 4.0.6 and 4.1.2 Bootstrap 3.2.0
  Updated ruby version in travis
  Support for 4.0.6.rc3 Support for 4.1.2.rc3 Fontawesome 4.1.0 Bumped version to 0.7.0
* Updated Rails dependencies
Merge branch 'hotfix/0.7.1' into develop

* hotfix/0.7.1:
  * Updated Rails dependencies