fix view
Merge branch 'dev' of https://github.com/valiknet18/mychristmas into dev

Conflicts:
	app/Resources/views/base.html.twig
	src/AppBundle/Tests/Controller/DefaultControllerTest.php