Merge pull request #1 from gravitystorm/master

update from original
Delete beach.png
Delete orchard.png
add 8x8 symbols for beach and orchard
metatile alignments
Delete mud.png
metatile for mud in water.mss
Merge branch 'beach_orchard_metatile' of github.com:polarbearing/openstreetmap-carto into beach_orchard_metatile
metatile for mud in water.mss
cutting allotments from 16x16 to 8x8
Layout changes SQL
Restore rendering of bridges
Remove duplicate and inconsistent condition from water_lines_casing

This resolves #939
Render roads with access restrictions below other roads.

Render roads with access restrictions (assuming same type, same z_order)
below other roads.

This resolves #245.
Reinstate oneway arrows on non-road highways

* Resolves #917
* Resolves #584
* Resolves #912
Merge pull request #968 from math1985/yaml-layout

Layout changes SQL
Merge branch 'oneway-on-paths' of https://github.com/math1985/openstreetmap-carto
Merge branch 'water-lines-casing-sql-bug' of https://github.com/math1985/openstreetmap-carto into math1985-water-lines-casing-sql-bug
Merge branch 'math1985-water-lines-casing-sql-bug'
Merge branch 'access-order' of https://github.com/math1985/openstreetmap-carto into math1985-access-order

Conflicts:
	project.mml