edit profile pic dialog added
Merge remote-tracking branch 'origin'