Updated location change update message
Merge branch 'develop' into beacon-exercise-recognition