Added more callbacks to user location
Merge branch 'location'