redirect

request user

invitation update
lsqdg
3
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/SymfonyRequirements.php
	app/check.php
	nbproject/private/private.properties
	nbproject/private/private.xml
	src/FrontOffice/UserBundle/Resources/config/routing.yml

	src/FrontOffice/UserBundle/Resources/views/Resetting/request_content.html.twig

	src/FrontOffice/UserBundle/Resources/views/Resetting/reset_content.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/ChangePassword/changePassword.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/ChangePassword/changePassword_content.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Group/edit.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Group/edit_content.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Group/list.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Group/list_content.html.twig
	src/FrontOffice/UserBundle/Resources/views/Security/Group/new.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Group/new_content.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Group/show.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Group/show_content.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Profile/edit.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Profile/edit_content.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Profile/show.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Profile/show_content.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Registration/checkEmail.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Registration/confirmed.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Registration/email.txt.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Registration/register.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Registration/register_content.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Resetting/checkEmail.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Resetting/email.txt.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Resetting/passwordAlreadyRequested.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Resetting/request.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Resetting/request_content.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Resetting/reset.html.twig

	src/FrontOffice/UserBundle/Resources/views/Security/Resetting/reset_content.html.twig
	src/FrontOffice/UserBundle/Resources/views/User/accueil.html.twig