dz
Merge branch 'master' of https://github.com/tristan-ch/Symfony

Conflicts:
	.idea/workspace.xml