Move Global Settings into confirmation Dialog, fix user not being able to create Geofences.
Merge remote-tracking branch 'origin/develop' into develop