admin
Merge branch 'master' of https://github.com/PabloGit88/conagra.git

Conflicts:
	app/config/config.yml
	app/config/routing.yml
Merge branch 'master' of https://github.com/PabloGit88/conagra

Conflicts:
	app/config/routing.yml
	src/Odiseo/Bundle/ConAgraBundle/Resources/views/Frontend/Intro/registerForm.html.twig