Under composer plus Doctrine Fixture Bundle
maj
Merge branch 'dev' of https://github.com/gbecchio/learn-symfony into dev

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
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/assetic/config/e/e3182f38d2984cd119243963ba19055d.php
	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/04/be/9ede4eb3f5e309f8a54b97fa56b3ce999816e3fa6aecf0fa5b63e5b3cff1.php
	app/cache/dev/twig/0c/1a/06cfe0caa0389b1df7716e8a38dbdbb42a90d00a4f3a91e3e666167cb9ef.php
	app/cache/dev/twig/1d/20/8d9f7e746fe15108014c11bd7e9288dee32701e44a808295ba4e45fe50ad.php
	app/cache/dev/twig/38/c3/99cdb1d941fc48ae8dda137f930663fd1599c7b8421e67bbeb9cf5901b67.php
	app/cache/dev/twig/3e/54/bd53bbf4964e228b7b004fde15676a7399af2483906a8c0c4c27246cbfb7.php
	app/cache/dev/twig/42/eb/f54e4ad3a5510a8709f2e81fa304afcdbd21a309fe841fc6f8191d1dd1ed.php
	app/cache/dev/twig/61/ed/d645d5abd3b8d3767d178619a9de94e5696714b6a7564135fbaa6347cec1.php
	app/cache/dev/twig/81/08/abd6c2a80c9ab56600f72733ba141927097b92e3954c7c05acc8fe6cae3c.php
	app/cache/dev/twig/9a/6f/af2a8aea3b1aee0cb70ff20e2884348f8567673013f02fe4bf1de054e5e7.php
	app/cache/dev/twig/9d/4a/bd28f40ca64970519367b36215c69cc319e4aeee4deeea27233ac124c00a.php
	app/cache/dev/twig/9f/86/44c63aab55381c22b7e1c6f880db140cf90b7f9aab38a62f7744d40d183a.php
	app/cache/dev/twig/a8/18/cbb899daa2c7887cfdcf127b6f089c707375c5d1e826f95956ee1cc3349f.php
	app/cache/dev/twig/a8/6f/7312fabdf82bd177c221a1904b9edfa995cc08307a34832a7ff37e6f3eb1.php
	app/cache/dev/twig/de/ca/75e1a962eb106c25a5f2f705e1bf5721a413b3521bf6b165fa32e1f59ab7.php
	app/config/parameters.yml
	app/logs/dev.log
	vendor/autoload.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
test