Updated to use Google Maps API V3
Merge branch 'google-maps-v3'