Merge branch 'master' into 'industry_list'

# Conflicts:
#   app/controllers/cities_controller.rb
#   app/models/city.rb
#   lib/src/csv_importer.rb