Merge branch 'hotfix/6.0.4'

* hotfix/6.0.4:
  * Rails 4.1.1
* Fixed version number
Merge branch 'hotfix/6.0.5' into develop

* hotfix/6.0.5:
  * Fixed version number