Menu & dialog fix
Merge branch 'master' of https://github.com/Ener-Getick/v3

Conflicts:
	app/Resources/views/model/layout.html.twig
	app/Resources/views/model/menu.html.twig