Merge branch 'master' into 'crawler'

# Conflicts:
#   app/assets/javascripts/custom.js
#   app/models/city.rb