Updated analytics events on get location
Merge branch 'dev' into beta