test

test
Merge branch 'master' of https://github.com/geekcoding/geekedu

Conflicts:
	src/Site/CommonBundle/Resources/views/Public/header.html.twig