[LOGIN]
Merge branch 'master' into 1t
fix
Merge branch 'refs/heads/1t' into test

Conflicts:
	Resources/views/Security/forgotPassword.html.twig
	Resources/views/Security/login.html.twig
	Resources/views/Security/resetPassword.html.twig
Merge branch '1t'