test
t
Merge branch 'master' of https://github.com/Dexedrine/CulturalStore

Conflicts:
	app/AppCache.php
	app/AppKernel.php
	app/Resources/views/base.html.twig
	app/SymfonyRequirements.php
	app/autoload.php
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevDebugProjectContainerCompiler.log
	app/cache/dev/assetic/routing.yml
	app/check.php
	app/config/config.yml
	app/config/config_dev.yml
	app/config/config_prod.yml
	app/config/config_test.yml
	app/config/parameters.yml.dist
	app/config/routing.yml
	app/config/routing_dev.yml
	app/config/security.yml
	app/phpunit.xml.dist
	bin/doctrine
	bin/doctrine.php
	composer.json
	web/app.php
	web/app_dev.php
	web/apple-touch-icon.png
	web/config.php
	web/favicon.ico
	web/robots.txt
modif des app
modification du gitignore