Merge branch 'hotfix/1.2.1'
Merge branch 'develop' of github.com:diowa/ruby2-rails4-bootstrap-heroku into develop

* 'develop' of github.com:diowa/ruby2-rails4-bootstrap-heroku:
Updated gems
Merge branch 'hotfix/1.2.2' into develop

* hotfix/1.2.2:
  Updated gems