just reformatted.
Added Gettters and setters for some entities
Merge branch 'develop' of github.com:snwfog/whm_fsts into develop

Conflicts:
	application/model/Household.php