Merge remote-tracking branch 'origin/master'

Conflicts:
	HospitalOldSheet.rtm
	Log/Ratings.log
	Ratings31.exe
	Ratings31.map
	ReportHospital.dcu
	ReportHospital.dfm
	ReportHospital.~dfm
	ReportHospital2.dfm
	ReportHospital2.~dfm
	UnitTSNImportMCP.dcu
	formmain.dcu
	formmain.dfm
	formmain.~dfm

report changes
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit e3f3124532f70cacdf1752399480a32ae25758d9.