Merge household_redesign

Conflicts:
	composer.lock
Add change log