added Waze maps, fixed Google Maps
Merge pull request #2 from vvarp/master

added Waze maps, fixed Google Maps