osef
Merge branch 'master' of http://github.com/VPecquerie/PFV2

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/twig/2a/c0/a0932adc61b4017754a8aadb142fa4ab704f9129dfa0e05bc1a9025f0fe0.php
	app/cache/dev/twig/c4/da/1170402af3450f1ee2ecc1889c2d9cd863a1ebb09606e3d1e41efa33e415.php
	app/cache/dev/twig/c9/10/51906a2318784d15effba806108190444e30e18b973775e84ca64232cf24.php
	app/logs/dev.log