Merge branch 'hotfix/2.10.2'

* hotfix/2.10.2:
  Fixed generator
* Updated Rails dependencies
Merge branch 'hotfix/2.10.3' into develop

* hotfix/2.10.3:
  * Updated Rails dependencies