ok
Merge branch 'master' of https://github.com/spywider/Housecare

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