Finished Location Settings
Merge branch 'LocationSettings' into dev