HUGE UX IMPROVEMENT: disable scroll wheel zoom
Merge branch 'map-view-unit-tests'