Merge branch 'master' into 'industry_list'

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

lib/src/job_parser.rb

@@ -15,6 +15,7 @@ class JobParser
     links = info.css('div.caption a.company-name').map { |link| link['href'] }
     links.each do |link|
       next if link == 'javascript:void(0);'
+
       page = Nokogiri::HTML(URI.open(URI.escape(link)))
       name = page.search('p.name')&.text
       next if name.blank?