changed city to district in household fixture
refactored
Merge branch 'develop' of github.com:snwfog/whm_fsts into develop

Conflicts:
	local-config.php