mise  jour gitignore
Merge branch 'master' of github.com:abdoulboubacar/arvato-bmw

Conflicts:
	app/cache/dev/Admingenerated/BaseAdminBundle/BaseConcessionController/ListController.php
	app/cache/dev/Admingenerated/BaseAdminBundle/Form/BaseConcessionType/FiltersType.php
	app/cache/dev/Admingenerated/BaseAdminBundle/Resources/views/ConcessionList/index.html.twig
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevDebugProjectContainerCompiler.log
	app/cache/dev/appdevUrlGenerator.php.meta
	app/cache/dev/appdevUrlMatcher.php.meta
	app/cache/dev/assetic/config/4/4906fc936f47a166f2970c42600b18d3.php
	app/cache/dev/classes.php
	app/cache/dev/classes.php.meta
	app/cache/dev/jms_diextra/controller_injectors/AdmingeneratedBaseAdminBundleBaseConcessionControllerDeleteController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/AdmingeneratedBaseAdminBundleBaseConcessionControllerEditController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/AdmingeneratedBaseAdminBundleBaseConcessionControllerListController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/AdmingeneratedBaseAdminBundleBaseConcessionControllerNewController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/AdmingeneratorGeneratorBundleControllerDashboardController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/AdmingeneratorGeneratorBundleControllerDoctrineBaseController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/AdmingeneratorGeneratorBundleControllerDoctrineODMBaseController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/AdmingeneratorGeneratorBundleControllerPropelBaseController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/BaseAdminBundleControllerConcessionDeleteController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/BaseAdminBundleControllerConcessionEditController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/BaseAdminBundleControllerConcessionListController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/BaseAdminBundleControllerConcessionNewController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/BaseBaseBundleControllerDefaultController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/DoctrineBundleDoctrineBundleControllerProfilerController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/FOSUserBundleControllerChangePasswordController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/FOSUserBundleControllerGroupController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/FOSUserBundleControllerProfileController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/FOSUserBundleControllerRegistrationController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/FOSUserBundleControllerResettingController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/FOSUserBundleControllerSecurityController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/SensioBundleDistributionBundleControllerConfiguratorController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/SymfonyBundleAsseticBundleControllerAsseticController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/SymfonyBundleFrameworkBundleControllerInternalController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/SymfonyBundleFrameworkBundleControllerRedirectController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/SymfonyBundleFrameworkBundleControllerTemplateController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/SymfonyBundleTwigBundleControllerExceptionController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/SymfonyBundleWebProfilerBundleControllerExceptionController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/SymfonyBundleWebProfilerBundleControllerProfilerController.php.meta
	app/cache/dev/jms_diextra/controller_injectors/SymfonyBundleWebProfilerBundleControllerRouterController.php.meta
	app/cache/dev/profiler/index.csv
	app/cache/dev/twig/0b/c9/b5cbfbf30da86cd1806dc2a185f8.php
	app/cache/dev/twig/19/16/bfcc95a138ef73be08edb448ea8e.php
	app/cache/dev/twig/50/6d/31adf59cf8836cd4a15346f124a2.php
	app/cache/dev/twig/6f/77/04cb0339bdc9d19ed7ec300bb6d5.php
	app/cache/dev/twig/74/48/3d2c762af387a57a12ce348d409d.php
	app/cache/dev/twig/91/13/5bfabfd73e5fdf80a676ae3b0f3e.php
	app/cache/dev/twig/d1/75/909125ce696e1284d306a1596582.php
	app/cache/dev/twig/e1/10/f1d0d23efb4f8301b1c9c8dca14a.php
	app/cache/prod/Admingenerated/BaseAdminBundle/BaseConcessionController/ListController.php
	app/cache/prod/Admingenerated/BaseAdminBundle/Form/BaseConcessionType/FiltersType.php
	app/cache/prod/Admingenerated/BaseAdminBundle/Resources/views/ConcessionList/index.html.twig
	app/cache/prod/appProdDebugProjectContainer.php
	app/cache/prod/appProdDebugProjectContainer.xml
	app/cache/prod/appProdDebugProjectContainerCompiler.log
	app/cache/prod/appprodUrlGenerator.php
	app/cache/prod/appprodUrlGenerator.php.meta
	app/cache/prod/appprodUrlMatcher.php
	app/cache/prod/appprodUrlMatcher.php.meta
	app/cache/prod/classes.php
	app/cache/prod/classes.php.meta
	app/logs/dev.log
	vendor/autoload.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
	vendor/kriswallsmith/assetic
merge