Carles: Probes de merge amb Ricard
Merge https://github.com/BancDelTempsDAW/symfony

Conflicts:
	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/routing.yml
	app/cache/dev/classes.php
	app/cache/dev/classes.php.meta
	app/cache/dev/profiler/index.csv
	app/cache/dev/twig/12/4d/f3eb4017ac6aa8d6576ebf95f6723f8a57b8fe135b51d1cc9dd5c03e8614.php
	app/cache/dev/twig/40/9f/e602f1e73010e7b29e7795758de871112fb544c040b70f5f127eb35e6793.php
	app/cache/dev/twig/47/28/73cc170550f466c0617dba8afb19ff5663bc9bcbf79055565b0f341b1460.php
	app/cache/dev/twig/58/9a/48f67c975839f2968b9a852a576a9e95ce017f37bcbbe5085d0ac5ced6ec.php
	app/cache/dev/twig/5d/a8/cc9713ad296be2948349cd1770aba5eb1cfd001ab5a97dabd47907224f2a.php
	app/cache/dev/twig/ba/97/14cc641037fa2637955323f18111b5555c15517f5b6429182e54ac87bcf6.php