go on
Merge branch 'master' of github.com:julienfastre/Cigogne

Conflicts:
	src/Fastre/CigogneBundle/Resources/views/Listing/view.html.twig
	src/Fastre/CigogneBundle/Resources/views/layout.html.twig