Merge branch 'hotfix/4.0.5'

* hotfix/4.0.5:
  * Rails 4.0.3 * Updated gems
* Updated gems
Merge branch 'hotfix/4.0.6' into develop

* hotfix/4.0.6:
  * Updated gems