Trying to implement changing password
Merge remote-tracking branch 'origin/master' into OrrBranch
Settings changes
Merge remote-tracking branch 'origin/master' into OrrBranch
More settings work. Settings are almost done.
Final work on settings
Merge remote-tracking branch 'origin/OrrBranch'