Merge pull request #1 from gravitystorm/master

update with changes from master in past month

CHANGELOG.md

@@ -1,4 +1,33 @@
-## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.14.0...master)
+## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.15.0...master)
+## Changes
+- Changing societal amenities color to less intensive
+- Adding rendering for natural=strait
+- Adding rendering for leisure=track on lines
+- Adding icon for amenity=vehicle_inspection
+- Adding icon for leisure=sports_centre + sport=swimming and leisure=swimming_area
+- Adding icon for tourism=gallery
+- Changing color for aeroway=apron in aerodromes
+- Moving amenity=post_box to z19+
+- Moving amenity=atm to z19+
+- Replacing icon for information=tactile_model
+- Ordering amenity_lines by layer
+- Small documentation and code fixes
+
+## [v4.15.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.14.0...v4.15.0) - 2018-09-21
+## Changes
+- Changing gastronomy objects color to orange (affects restaurant, fast_food, ice_cream, food_court, bar, cafe, nightclub, pub and biergarten)
+- Changing farmland and societal amenities (like school, hospital etc.) colors to fit better into the overall color systematic
+- Adding rendering for man_made=wastewater_plant and man_made=water_works
+- Adding icon for man_made=storage_tank and man_made=silo
+- Adding icon for amenity=bicycle_repair_station
+- Adding icon for leisure=amusement_arcade
+- Adding icon for shop=bookmaker
+- Adding icon for shop=trade and shop=wholesale
+- Adding rendering for attraction=water_slide
+- Rendering most of the road links thinner (affects trunk_link, primary_link, secondary_link)
+- Moving manors to z16+
+- Fixing missing country labels on z4 (affects Canada, Russia and Greenland)
+- Small code and icon fixes
 
 ## [v4.14.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v4.13.0...v4.14.0) - 2018-08-17
 ## Changes