1
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	FormsFarmacy/MainForm.pas
	TEST/DPR/FarmacyTest.dpr
	TEST/DPR/FarmacyTest.dproj