save functions
save functions
Merge remote-tracking branch 'origin/savefiles' into savefiles

Conflicts:
	condominium.h
Fixing some errors
merge fixed