Merge branch 'hotfix/0.18.1'

* hotfix/0.18.1:
  * Rails 4.1.7 * Updated gems
* Ruby 2.1.4
updated changelog
Merge branch 'hotfix/0.18.2' into develop

* hotfix/0.18.2:
  updated changelog
  * Ruby 2.1.4