test
modification du filtre categorie Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/profiler/index.csv
	app/cache/dev/sessions/sess_t1gs4g4jddokli2imog8h6qt96
	app/logs/dev.log
Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	app/cache/prod/appProdProjectContainer.php
	app/cache/prod/appProdUrlMatcher.php
	app/config/parameters.yml.dist
	app/logs/dev.log