ajout Pinano Bundle
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/classes.php
	app/cache/dev/classes.php.meta
	app/cache/dev/profiler/index.csv
	app/cache/dev/twig/29/97/071c04b09edc8cd0f2aa3ade1c4ec193683a7d86689ba8d5f3bd159068f1.php
	app/cache/dev/twig/44/b3/f6ab1d0105d1ed6bd90ffd4c40a7e63fab2947f26998a651cf844b73293a.php
	app/cache/dev/twig/4b/1b/3d01a42d6dc724fd6606966e911690a0b8e3fc60342fb1461ff90f3e091b.php
	app/cache/dev/twig/57/cb/199f720201a82cbf7de82f0c0049403a63c1978e1950a1c14942db9e1c4c.php
	app/cache/dev/twig/70/aa/df21b5ef4c08a2ec1a944d1d64182e686b1b5c9acd54f46cf0a29403a196.php
	app/cache/dev/twig/7e/f2/f0e54ba5da5a4efdf7584557794a6d29943aca71cc80961dceadf374c48a.php
	app/cache/dev/twig/82/c9/a4986d528513a939df1801434b53af5e61834d51b8ceb840741dca945843.php
	app/cache/dev/twig/a4/ac/531a53229f351ac96ede3510ce299fa1f7d0dadbc09fda3a5fd19444fd23.php
	app/cache/dev/twig/c3/fb/e9728baab771f733a8ddb56621fe7996f5b60eca1634039d9ea1cbae94ca.php
	app/cache/dev/twig/fe/46/91f311b82318556c56225373b23a5be00b20e563fafef99d076f443f90f9.php
	app/logs/dev.log
	composer.json
	composer.lock
	vendor/autoload.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
test de pinano bundle
fuck