Update Fixtures Load and Fight Page
Merge branch 'master' of https://github.com/raphaChoquet/Potager

Conflicts:
	src/Potager/FrontBundle/Resources/views/Default/index.html.twig