Made save button close and impliment gps location save
Merge branch 'LocationSettings' into dev