Merge pull request #1786 from Leaflet/preventDefault

Remove preventDefault again, fix FF
minor formatting stuff
update changelog and build
fix regression of not being able to addLayer in initHooks
update build
add Circle & CircleMarker toGeoJSON
Use "wheel" event where supported (#1788)
Merge pull request #1789 from Leaflet/wheel

Use "wheel" event where supported (#1788)
bump version, update changelog and build
minor changelog fix
remove outdated changelog line
update docs section in contributing guide
bring back the horrible timeout hack for Android, close #1785
update build
reorder items in the changelog a bit
make npm package name lowercase as required
fix clash of zoom button hover styles with Bootstrap, close #1791
update jshint and karma versions in deps
fix EPSG3395 zooming, close #1796
Revert "Use "wheel" event where supported (#1788)"

This reverts commit a784c560e520ce5654da489330932e0a47883e67.