Merge branch 'master' into gh-master

# Conflicts:
#	Makefile
#	layers/landuse/landuse.sql
#	layers/poi/poi.sql

layers/landuse/mapping.yaml

@@ -69,6 +69,9 @@ tables:
       type: string
     - name: area
       type: area
+    - name: man_made
+      key: man_made
+      type: string
     mapping:
       landuse:
       - railway
@@ -80,6 +83,8 @@ tables:
       - industrial
       - garages
       - retail
+      - religious
+      - construction
       amenity:
       - bus_station
       - school
@@ -88,17 +93,27 @@ tables:
       - college
       - library
       - hospital
+      - parking
+      - prison
+      - motorcycle_parking
+      - bicycle_parking
+      - animal_training
       leisure:
       - stadium
       - pitch
       - playground
       - track
+      - sports_centre
       tourism:
       - theme_park
       - zoo
+      - picnic_site
       place:
       - suburb
       - quarter
       - neighbourhood
       waterway:
       - dam
+      man_made:
+      - wastewater_plant
+      - water_works