Google Map integration
Merge branch 'master' into googlemaps
Merge pull request #65 from mtabor150/googlemaps

Googlemaps