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

Conflicts:
	src/Dof/MainBundle/Controller/DefaultController.php
Merge branch 'master' of github.com:Ener-Getick/v3

Conflicts:
	src/Dof/MainBundle/Controller/DefaultController.php