Add Send to Google Maps again

Readded Send to Maps and fixed the git conflicts