modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Branch/location.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/showProducer.html.twig
Merge branch 'feature-producer-infos' of https://github.com/isics/OpenMiamMiam into feature-producer-infos

Conflicts:
	src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Branch/location.html.twig

	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/js/front.js
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/translations/messages.fr.yml
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Branch/base.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Branch/location.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Controller/BranchController.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Controller/GeneralController.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Admin/Producer/edit.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Branch/base.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Branch/location.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Branch/showProducers.html.twig