add scope reference when using class constants in leafletmap.js
remove merge conflict from schema.rb