geofences enabled
Merge branch 'dev'