Ajout vendor Doctrine Fixtures
Merge branch 'master' of https://github.com/Axel29/Symfony

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevDebugProjectContainerCompiler.log
	app/cache/dev/classes.map
	app/config/parameters.yml
	app/logs/dev.log