Merge branch 'hotfix/0.18.4'

* hotfix/0.18.4:
  * Updated gems
* Rails 4.1.8
* Updated gems
* Fixed version number
Merge branch 'hotfix/0.18.5' into develop

* hotfix/0.18.5:
  * Rails 4.1.8 * Updated gems * Fixed version number