Revert "Merge pull request #466 from ngodfraind/display-email"

This reverts commit 44fede00d86f2e715f23672ca2343db94b2f48ff, reversing
changes made to 349ce23e5154141468d45aa2220309976ec70b55.
Merge branch 'master' into test-revert-patch

Conflicts:
	Library/Installation/Updater/Updater021101.php
add twig text_extension
Merge pull request #484 from arnaudbey/add-twig-extension

add twig text_extension
Merge branch 'master' into test-revert-patch

Conflicts:
	Resources/translations/platform.en.yml
	Resources/translations/platform.fr.yml
Merge pull request #481 from stefk/revert-mail-option

Revert mail option
Merge branch 'master' into user_public_url

Conflicts:
	Controller/ProfileController.php
	Entity/User.php
	Form/ProfileType.php
	Library/Installation/AdditionalInstaller.php
	Resources/views/Profile/profile.html.twig