Updated rails
Merge branch 'master' of git://github.com/unepwcmc/magpie

* 'master' of git://github.com/unepwcmc/magpie: (106 commits)
  Add overlap fields to CSV
  Add errors correctly on result gathering fail
  Handle timeout error from protected planet
  Project json
  Don't murder servers by launching loads of sidekiqs 😈
  Be more error tolerant in importer
  Fix file read issues by copying, add sidekiq watcher
  Make importer user the right apartment
  Add status logging, make status page work properly
  Fix polygon format parser, add delete cartodb table
  Format polygon geojson correctly
  Fix geometry insertion type
  Commit all polygon upload files
  Add polygon creation method 😎
  Fix cartodb config keys
  Add safe cartodb config
  Add cartodb upload code
  Add polygon upload model
  Add polygon upload model
  Added parent frame postMessage to create from file
  ...

Conflicts:
	Gemfile.lock