Finished
Merge remote-tracking branch 'origin/savingSettings' into dev