commit sur portable
Merge branch 'master' of https://github.com/SulivanDotEu/benskiv2

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevDebugProjectContainerCompiler.log
	app/cache/dev/assetic/routing.yml
modification des options coté utilisateur