fixed bug in edit profile
Merge branch 'master'