bunch more shit

Signed-off-by: rich sollenne <rich@sollenne.com>
Merge branch 'master' of github.com:mdchappe/kronosource

Signed-off-by: rich sollenne <rich@sollenne.com>

Conflicts:
	application/views/property/update_unit.php