log supprime
commit rapide (changemlent sur les routes)
Merge branch 'master' of https://github.com/spywider/Housecare
Merge branch 'benjamin'

Conflicts:
	src/Housecare/CalendarBundle/Resources/config/routing.yml
ok ok ok
k
Merge branch 'master' of https://github.com/spywider/Housecare

Conflicts:
	app/logs/dev.log
upprimer coucou
Merge branch 'benjamin'

Conflicts:
	app/config/parameters.yml
	app/logs/dev.log