v1 single ok, v1 many wip
composer update
composer update
wip
simplify edit of v1 & v2 households
Merge household_redesign

Conflicts:
	composer.lock