TEST
Merge branch 'master' of github.com:Ener-Getick/v3

Conflicts:
	src/Dof/UserBundle/Resources/views/Profile/index.html.twig