added a part of the edit profile
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
addded edit profile functionality
Merge remote-tracking branch 'origin/master'