committing google maps to merge into master
Merge branch 'map'