ttest 2
test du commit avec juste CalendarRender.php
ok
Merge branch 'master' of https://github.com/spywider/Housecare

Conflicts:
	app/config/parameters.yml
	app/logs/dev.log
	app/logs/prod.log
Merge branch 'benjamin'

Conflicts:
	LICENSE