Merge branch 'adding_advertising_column' of https://github.com/Xavier-J-Ortiz/iD into Xavier-J-Ortiz-adding_advertising_column

dist/locales/en.json

@@ -2819,6 +2819,10 @@
                     "name": "Billboard",
                     "terms": ""
                 },
+                "advertising/column": {
+                    "name": "Advertising Column",
+                    "terms": ""
+                },
                 "aerialway/station": {
                     "name": "Aerialway Station",
                     "terms": ""
@@ -6673,7 +6677,7 @@
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Basemap of Austria, based on goverment data.",
+                "description": "Basemap of Austria, based on government data.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -6735,7 +6739,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Map tiles by Stamen Design, under CC BY 3.0"
+                    "text": "Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL"
                 },
                 "name": "Stamen Terrain"
             },