Merge branch 'hotfix/10.1.1'

* hotfix/10.1.1:
  * Rails 4.1.7 * Updated gems
* Ruby 2.1.4
Merge branch 'hotfix/10.1.2' into develop

* hotfix/10.1.2:
  * Ruby 2.1.4