fixed google maps
Merge branch 'grant'
fixed merge