Merge branch 'hotfix/fix-typos-sitemap-questions'
added display name
Merge branch 'hotfix/add-display-name-to-server-email' into develop