Geofencing Branch into Master

Merge Geofencing Branch into Master