modified:   src/Isics/Bundle/OpenMiamMiamBundle/Controller/BranchController.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Controller/GeneralController.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Entity/Repository/ProducerRepository.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Controller/GeneralController.php
	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/assets/less/front.less
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/less/front.less
	new file:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/showProducer.html.twig
	new file:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/showProducers.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/js/front.js
	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/baseJavascripts.html.twig
	new file:   web/js/maps.js
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Behat/FeatureContext.php
	new file:   src/Isics/Bundle/OpenMiamMiamBundle/Command/ImportProducersCommand.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Controller/Admin/Producer/CalendarController.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Controller/Admin/Producer/SalesOrderController.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Controller/CartController.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/DependencyInjection/Configuration.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Entity/Repository/ProductRepository.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Entity/Repository/SalesOrderRepository.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Entity/SalesOrder.php
	new file:   src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/AddRowsToSalesOrderType.php
	new file:   src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/ArtificialProductType.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/CartItemType.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/CartType.php
	renamed:    src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/Admin/ProducerAttendancesType.php -> src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/ProducerAttendancesType.php
	renamed:    src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/Admin/ProducerBranchAttendancesType.php -> src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/ProducerBranchAttendancesType.php
	renamed:    src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/Admin/ProducerBranchOccurrenceAttendanceType.php -> src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/ProducerBranchOccurrenceAttendanceType.php
	renamed:    src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/Admin/ProducerSalesOrderType.php -> src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/ProducerSalesOrderType.php
	renamed:    src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/Admin/ProducerType.php -> src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/ProducerType.php
	renamed:    src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/Admin/ProductType.php -> src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/ProductType.php
	renamed:    src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/Admin/SalesOrderRowType.php -> src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/SalesOrderRowType.php
	renamed:    src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/Admin/SalesOrderType.php -> src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/SalesOrderType.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Manager/ProducerAttendancesManager.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Manager/SalesOrderManager.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Menu/Builder.php
	new file:   src/Isics/Bundle/OpenMiamMiamBundle/Model/SalesOrder/ArtificialProduct.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/js/admin.js
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/js/front.js
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/less/admin.less
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/less/front.less
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/config/routing/admin.yml
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/config/services.yml
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/config/validation/product.yml
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/features/frontend/cart.feature
	new file:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/public/img/loader.gif
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/translations/messages.fr.yml
	new file:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Admin/Producer/SalesOrder/addSalesOrderRows.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Admin/Producer/SalesOrder/edit.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Admin/Producer/showDashboard.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Admin/base.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Branch/base.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Branch/showHomepage.html.twig
	new file:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Cart/cart.html.twig
	new file:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Cart/headerCart.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Cart/show.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Cart/showAddForm.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Cart/summarize.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Catalog/showCategory.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Catalog/showProduct.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/base.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/baseJavascripts.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/baseLogo.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Twig/OpenMiamMiamExtension.php
	new file:   src/Isics/Bundle/OpenMiamMiamUserBundle/Command/ImportUsersCommand.php
	modified:   src/Isics/Bundle/OpenMiamMiamUserBundle/EventListener/ProfileEditingListener.php
	new file:   web/js/jquery-ui-1.10.3.custom.min.js
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Branch/base.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/js/front.js
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/less/front.less
	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/baseJavascripts.html.twig
Designed location map
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/js/front.js
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Form/Type/ProducerType.php
	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/Admin/Producer/edit.html.twig
Merge branch 'feature-producer-infos' of https://github.com/isics/OpenMiamMiam into feature-producer-infos
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/js/front.js
	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/assets/js/front.js
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/less/admin.less
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/translations/messages.fr.yml
	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
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Branch/showRandomProducers.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/baseJavascripts.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/showProducer.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Controller/BranchController.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Controller/GeneralController.php
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/js/front.js
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/assets/less/admin.less
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/translations/messages.fr.yml
	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
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/Branch/showRandomProducers.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/baseJavascripts.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/showProducer.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Controller/GeneralController.php
	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/location.html.twig
	modified:   src/Isics/Bundle/OpenMiamMiamBundle/Resources/views/showProducer.html.twig
Added route link under Google map
	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