reset inscri
Merge remote-tracking branch 'origin/master'

Conflicts:

	src/FrontOffice/UserBundle/Resources/views/Registration/register_content.html.twig
Merge branch 'master' of https://github.com/BewBa/Opt2