edit profile should you allow more than one click
Merge remote-tracking branch 'origin/master'