Fixed admin view of Household
Merge branch 'develop'