Disabled scrollwheel zoom of maps
Merge branch 'origin/master'