Merge branch 'master' into develop

assets/layers/charging_station/charging_station.protojson

@@ -794,7 +794,6 @@
       }
     }
   ],
-  "wayHandling": 1,
   "filter": [
     {
       "id": "vehicle-type",

assets/svg/license_info.json

@@ -733,6 +733,16 @@
     ],
     "sources": []
   },
+  {
+    "path": "liberapay.svg",
+    "license": "Logo (all rights reserved)",
+    "authors": [
+      "LiberaPay"
+    ],
+    "sources": [
+      "https://liberapay.com/"
+    ]
+  },
   {
     "path": "loading.svg",
     "license": "CC0; trivial",
@@ -1241,6 +1251,22 @@
       "https://www.onlinewebfonts.com/icon/197818"
     ]
   },
+  {
+    "path": "teardrop.svg",
+    "license": "CC0",
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "sources": []
+  },
+  {
+    "path": "teardrop_with_hole_green.svg",
+    "license": "CC0",
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "sources": []
+  },
   {
     "path": "translate.svg",
     "license": "CC-BY-SA 3.0",

assets/tagRenderings/questions.json

@@ -397,7 +397,6 @@
         "if": "service:electricity=no"
       }
     ]
-    
   },
   "payment-options": {
     "question": {