Email now shown next to avatar when signed in.
Merge remote-tracking branch 'origin/master'