Add a preset for a locksmith
Merge pull request #1882 from pnorman/locksmith

Add a preset for a locksmith
Prefer to render highway=* styles over railway=*

Fixes #1880
Don't allow dragging of the map when the click starts in a button

Fixes #1869
Preserve existing Wikipedia language (fixes #1868)
Cleanup; set correct language for pasted wikipedia links
Ensure preset fields are consistently ordered (#1876)
Don't add addr:housenumber=yes when applying Address preset (#1874)
Special case 'yes' values for type fields (#1876)
Treat a sole area=yes tag as "untagged" (#1867)
Allow "yes" and "no" check values to be translated (fixes #1819)
Add grocery store term to supermarket.
Merge pull request #1886 from iandees/new-presets-1

Add grocery store term to supermarket.
iD.geo.edgeEqual
Don't prevent following an existing way when drawing (fixes #1430)
Remove unnecessary history save

The intro saves and restored the current state via toJSON/fromJSON.
More reliable method for mutexed localStorage saves

Fixes #1883
Don't show combobox menu with only one item
Fix misspelling
Show all combobox entries when clicking the caret (fixes #1755)