fixed google map zoom level
merge branch