Added Email Edit function in the Settings
Merge remote-tracking branch 'origin/master'