Merge branch 'master' of https://github.com/Silendel/Nuit-de-l-Info
Merge branch 'master' of https://github.com/Silendel/Nuit-de-l-Info

Conflicts:
	view/templates/BaseTemplate2.html.twig
Fixed merge error
Merge branch 'master' of https://github.com/Silendel/Nuit-de-l-Info