Merge branch 'hotfix/0.6.2'

* hotfix/0.6.2:
  Fixed generator
* Updated Rails dependencies
Merge branch 'hotfix/0.6.3' into develop

* hotfix/0.6.3:
  * Updated Rails dependencies