Gemfile update
Merge branch 'master' of github.com:copernico-ide/rails_app

Merge resulting from pull
Merge branch 'master' of github.com:copernico-ide/rails_app

Merge resulting from pull