Merge branch 'hotfix/0.6.3'

* hotfix/0.6.3:
  * Updated Rails dependencies
* Added Gemfile.lock to .gitignore
Merge branch 'hotfix/0.6.4' into develop

* hotfix/0.6.4:
  * Added Gemfile.lock to .gitignore