Profile Changes
Merge branch 'Settings1' into master1
Merged with Greg’s Copy