abc
Merge remote-tracking branch 'origin/master'

Conflicts:
	inc/household.php
	inc/lifestyle.php
Merge branch 'master' of https://github.com/mllim3/3dified

Conflicts:
	inc/household.php
	inc/lifestyle.php