Merge origin/master

Conflicts:
	app/AppKernel.php
	app/Resources/views/base.html.twig
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/classes.php
	app/cache/dev/profiler/index.csv
	app/cache/dev/twig/01/f5/401bef7d70598bd0446e26e849b63eeb9579cb212aec6845c3178da21dc0.php
	app/cache/dev/twig/19/0b/8dc744c7ad02e322d628e811573f65e670cd9b1ef7a1b9fd919c64d9fe08.php
	app/cache/dev/twig/24/95/c74d4e889dc7ca6a86a61bdd4564fa20e41499ca7194a50e2449f0114e01.php
	app/cache/dev/twig/30/ea/70a16e2566feb5780c2e197741be4ea4d737769185f32f903e8e966b1943.php
	app/cache/dev/twig/37/66/33dec95d26dc8233105a42c3337a1369e25130c96dde64819d210891199f.php
	app/cache/dev/twig/3f/91/e359fed12ec67abf6101e5de2bdbc76ac0b045f758e6c12c7016151ec62f.php
	app/cache/dev/twig/48/45/40ef9785a8540aec40679963ebb327f534c2db7595f640011d4d72620399.php
	app/cache/dev/twig/52/b9/a208b8c6155833c0e8cb17542ff07618433a046b78626199d5c255509ee1.php
	app/cache/dev/twig/56/27/7a4bf9b8736b5a3af4fa5f3f3906c7f604d4bc41f160c2dd243a524d42f4.php
	app/cache/dev/twig/62/cb/855c9e7373f6cf88955550c379d1ad9941b312a95840cff161677b77733a.php
	app/cache/dev/twig/6b/e0/4359b04ef2e4f73b9e54afa2d2c500c7508de660a40a2607f712bce3fb00.php
	app/cache/dev/twig/7e/46/e807840ca4931cbcd95dd5f03f58cc9a8e32656085aa658b7cded82e4c8a.php
	app/cache/dev/twig/8b/b0/98737f5c8a61286e9f20e26f1d5a05d6d1673eec7d29ed075089588d1177.php
	app/cache/dev/twig/93/5e/49b58b4c497678f281b687d6320fbc57ba1c4c011d7da4607be95b720291.php
	app/cache/dev/twig/97/d3/3cbd695ebde3d6edf9ae3deb466f0e0955a04cb0f03959325bc7088ea273.php
	app/cache/dev/twig/98/fb/79daf8ec020d9ed7c31a634b8205ab37e73ea801a7b59bae39a02f8a903b.php
	app/cache/dev/twig/9f/a2/865d1722455ccf2ffdfa15f977c867909ea3d5b07c30360148a77156dd73.php
	app/cache/dev/twig/a2/49/e2180eb781c1092dba79cd8375ef65c253898481d1b7e9a876b44c3efaed.php
	app/cache/dev/twig/a3/12/5ed8e11dbe81719a1d93da9686e94464bb8323f357647adbdf0915192c25.php
	app/cache/dev/twig/a5/76/ba0d667ab5194943fda2f8e0f58a44d2850173c77e4004f734a185212724.php
	app/cache/dev/twig/b8/49/f47d00bb8728447a85b0fb73b3a0ccce075d2a4401d2a71b45674626e612.php
	app/cache/dev/twig/ba/06/9e87a438ef581790fbe19d4895aa9265e1c4b173c3d2df864deac4ea445f.php
	app/cache/dev/twig/be/74/277e21fce66796983dc57778cb3f6b9c688ee7fcf3dba5a9ebd20012de71.php
	app/cache/dev/twig/bf/26/71f4ba0b751bfc967d87e46a262301b408ef120b7cd3c66848da540954b4.php
	app/cache/dev/twig/d7/29/7ca174517ab9f340c20dad269e439bea8ec809bef3fc7aa06d5d5cc3805d.php
	app/config/config.yml
	app/config/routing.yml
	app/logs/dev.log
	composer.json
	composer.lock
	src/FrontOffice/UserBundle/Controller/DefaultController.php
	src/FrontOffice/UserBundle/Resources/config/routing.yml
	src/FrontOffice/UserBundle/Resources/views/Default/index.html.twig
	src/FrontOffice/UserBundle/Resources/views/Security/Registration/register.html.twig
	src/FrontOffice/UserBundle/Resources/views/layout.html.twig
	vendor/autoload.php
	vendor/composer/autoload_namespaces.php
	vendor/composer/autoload_psr4.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
	web/bundles/frontofficeuser/css/neon-core-min.css