Merge branch 'master' into 'csv'

# Conflicts:
#   app/models/city.rb
#   config/application.rb
Status Job ID Name Coverage
  Build
canceled #2371
build

 
  Test
canceled #2373
allowed to fail
codequality

canceled #2372
test