Display email address to self, on user profile
Merge branch 'master' of github.com:Collabforge/site-base