Merge branch 'hotfix/6.0.3'

* hotfix/6.0.3:
  * Fixed changelog * Updated gems
* Rails 4.1.1
Merge branch 'hotfix/6.0.4' into develop

* hotfix/6.0.4:
  * Rails 4.1.1