test
modif nico
Merge branch 'nicolas' of https://github.com/Harpaga/harpagaproject into nicolas

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/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/assetic/routing.yml
	app/cache/dev/classes.php
	app/cache/dev/classes.php.meta
	app/cache/dev/profiler/index.csv
	app/logs/dev.log