Added updating profile setting
merging
merge
Merge branch 'updating-users'